614 files changed, 0 insertions, 124550 deletions

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
deleted file mode 100644
index 4bbe6840ba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkJpaProject.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core;
-
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
-
-/**
- * EclipseLink JPA project.
- * <p>
- * 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 interface EclipseLinkJpaProject
-	extends JpaProject
-{
-
-	/**
-	 * Return the resource model object that corresponds to the file
-	 * <code>META-INF/eclipselink-orm.xml</code> if that file has the
-	 * EclipseLink content type.
-	 * 
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin#DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin#ECLIPSELINK_ORM_XML_CONTENT_TYPE
-	 */
-	JpaXmlResource getDefaultEclipseLinkOrmXmlResource();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkMappingKeys.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkMappingKeys.java
deleted file mode 100644
index c5a2cd8b0f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/EclipseLinkMappingKeys.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core;
-
-/**
- * 
- * 
- * 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.
- */
-@SuppressWarnings("nls")
-public interface EclipseLinkMappingKeys {
-
-	String BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY = "basicCollection";
-	String BASIC_MAP_ATTRIBUTE_MAPPING_KEY = "basicMap";
-	String TRANSFORMATION_ATTRIBUTE_MAPPING_KEY = "transformation";
-	String VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY = "variableOneToOne";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/JptJpaEclipseLinkCorePlugin.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/JptJpaEclipseLinkCorePlugin.java
deleted file mode 100644
index 46ad68cb7c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/JptJpaEclipseLinkCorePlugin.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_2.EclipseLink1_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JptJpaEclipseLinkCorePlugin extends Plugin
-{
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jpt.jpa.eclipselink.core"; //$NON-NLS-1$
-	
-	/**
-	 * Version string for EclipseLink platform version 1.0
-	 */
-	public static final String ECLIPSELINK_PLATFORM_VERSION_1_0 = "1.0";  //$NON-NLS-1$
-	
-	/**
-	 * Version string for EclipseLink platform version 1.1
-	 */
-	public static final String ECLIPSELINK_PLATFORM_VERSION_1_1 = "1.1";  //$NON-NLS-1$
-	
-	/**
-	 * Version string for EclipseLink platform version 1.2
-	 */
-	public static final String ECLIPSELINK_PLATFORM_VERSION_1_2 = "1.2";  //$NON-NLS-1$
-	
-	/**
-	 * Version string for EclipseLink platform version 2.0
-	 */
-	public static final String ECLIPSELINK_PLATFORM_VERSION_2_0 = "2.0";  //$NON-NLS-1$
-	
-	/**
-	 * Version string for EclipseLink platform version 2.1
-	 */
-	public static final String ECLIPSELINK_PLATFORM_VERSION_2_1 = "2.1";  //$NON-NLS-1$
-	
-	/**
-	 * Version string for EclipseLink platform version 2.2
-	 */
-	public static final String ECLIPSELINK_PLATFORM_VERSION_2_2 = "2.2";  //$NON-NLS-1$
-	
-	/**
-	 * Version string for EclipseLink platform version 2.3
-	 */
-	public static final String ECLIPSELINK_PLATFORM_VERSION_2_3 = "2.3";  //$NON-NLS-1$
-	
-	/**
-	 * Value of the content-type for eclipselink-orm.xml  mappings files. Use this 
-	 * value to retrieve the ORM xml content type from the content type manager 
-	 * and to add new eclipselink-orm.xml-like extensions to this content type.
-	 * 
-	 * @see org.eclipse.core.runtime.content.IContentTypeManager#getContentType(String)
-	 */
-	public static final IContentType ECLIPSELINK_ORM_XML_CONTENT_TYPE = 
-			Platform.getContentTypeManager().getContentType(PLUGIN_ID + ".content.orm"); //$NON-NLS-1$
-	
-	/**
-	 * The resource type for eclipselink-orm.xml version 1.0 mapping files
-	 */
-	public static final JptResourceType ECLIPSELINK_ORM_XML_1_0_RESOURCE_TYPE
-			= new JptResourceType(ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLink.SCHEMA_VERSION);
-	
-	/**
-	 * The resource type for eclipselink-orm.xml version 1.1 mapping files
-	 */
-	public static final JptResourceType ECLIPSELINK_ORM_XML_1_1_RESOURCE_TYPE
-			= new JptResourceType(ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLink1_1.SCHEMA_VERSION);
-	
-	/**
-	 * The resource type for eclipselink-orm.xml version 1.1 mapping files
-	 */
-	public static final JptResourceType ECLIPSELINK_ORM_XML_1_2_RESOURCE_TYPE
-			= new JptResourceType(ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLink1_2.SCHEMA_VERSION);
-	
-	/**
-	 * The resource type for eclipselink-orm.xml version 2.0 mapping files
-	 */
-	public static final JptResourceType ECLIPSELINK_ORM_XML_2_0_RESOURCE_TYPE
-			= new JptResourceType(ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLink2_0.SCHEMA_VERSION);
-	
-	/**
-	 * The resource type for eclipselink-orm.xml version 2.1 mapping files
-	 */
-	public static final JptResourceType ECLIPSELINK_ORM_XML_2_1_RESOURCE_TYPE
-			= new JptResourceType(ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLink2_1.SCHEMA_VERSION);
-	
-	/**
-	 * The resource type for eclipselink-orm.xml version 2.2 mapping files
-	 */
-	public static final JptResourceType ECLIPSELINK_ORM_XML_2_2_RESOURCE_TYPE
-			= new JptResourceType(ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLink2_2.SCHEMA_VERSION);
-	
-	/**
-	 * The resource type for eclipselink-orm.xml version 2.3 mapping files
-	 */
-	public static final JptResourceType ECLIPSELINK_ORM_XML_2_3_RESOURCE_TYPE
-			= new JptResourceType(ECLIPSELINK_ORM_XML_CONTENT_TYPE, EclipseLink2_3.SCHEMA_VERSION);
-	
-	public static final IPath DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH = new Path("META-INF/eclipselink-orm.xml"); //$NON-NLS-1$
-	
-	
-	// ********** singleton **********
-	private static JptJpaEclipseLinkCorePlugin INSTANCE;
-	
-	/**
-	 * Return the singleton JPT EclipseLink plug-in.
-	 */
-	public static JptJpaEclipseLinkCorePlugin instance() {
-		return INSTANCE;
-	}	
-	
-	/**
-	 * Log the specified message.
-	 */
-	public static void log(String msg) {
-        log(msg, null);
-    }
-
-	/**
-	 * Log the specified exception or error.
-	 */
-	public static void log(Throwable throwable) {
-		log(throwable.getLocalizedMessage(), throwable);
-	}
-
-	/**
-	 * Log the specified message and exception or error.
-	 */
-	public static void log(String msg, Throwable throwable) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, throwable));
-	}
-
-	/**
-	 * Log the specified status.
-	 */
-	public static void log(IStatus status) {
-        INSTANCE.getLog().log(status);
-    }
-
-	
-	// ********** plug-in implementation **********	
-	
-	public JptJpaEclipseLinkCorePlugin() {
-		super();
-	}
-		
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		INSTANCE = this;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		INSTANCE = null;
-		super.stop(context);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicCollectionMapping.java
deleted file mode 100644
index dba2c1bfac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicCollectionMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-
-/**
- * EclipseLink basic collection mapping
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkBasicCollectionMapping
-	extends AttributeMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicMapMapping.java
deleted file mode 100644
index d39716b6d9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicMapMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-
-/**
- * EclipseLink basic map mapping
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkBasicMapMapping
-	extends AttributeMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicMapping.java
deleted file mode 100644
index 97a2af28bf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkBasicMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.BasicMapping;
-
-/**
- * EclipseLink basic mapping.
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkBasicMapping
-	extends BasicMapping
-{
-	EclipseLinkMutable getMutable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCacheCoordinationType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCacheCoordinationType.java
deleted file mode 100644
index ea8581e80d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCacheCoordinationType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-
-/**
- * 
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum EclipseLinkCacheCoordinationType {
-
-	SEND_OBJECT_CHANGES,
-	INVALIDATE_CHANGED_OBJECTS,
-	SEND_NEW_OBJECTS_WITH_CHANGES,
-	NONE;
-	
-
-	public static EclipseLinkCacheCoordinationType fromJavaResourceModel(org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType javaCacheCoordinationType) {
-		if (javaCacheCoordinationType == null) {
-			return null;
-		}
-		switch (javaCacheCoordinationType) {
-			case SEND_OBJECT_CHANGES:
-				return SEND_OBJECT_CHANGES;
-			case INVALIDATE_CHANGED_OBJECTS:
-				return INVALIDATE_CHANGED_OBJECTS;
-			case SEND_NEW_OBJECTS_WITH_CHANGES:
-				return SEND_NEW_OBJECTS_WITH_CHANGES;
-			case NONE:
-				return NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache coordination type: " + javaCacheCoordinationType); //$NON-NLS-1$
-		}
-	}
-
-	public static org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType toJavaResourceModel(EclipseLinkCacheCoordinationType cacheCoordinationType) {
-		if (cacheCoordinationType == null) {
-			return null;
-		}
-		switch (cacheCoordinationType) {
-			case SEND_OBJECT_CHANGES:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType.SEND_OBJECT_CHANGES;
-			case INVALIDATE_CHANGED_OBJECTS:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType.INVALIDATE_CHANGED_OBJECTS;
-			case SEND_NEW_OBJECTS_WITH_CHANGES:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType.SEND_NEW_OBJECTS_WITH_CHANGES;
-			case NONE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType.NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache coordination type: " + cacheCoordinationType); //$NON-NLS-1$
-		}
-	}
-	
-
-	public static EclipseLinkCacheCoordinationType fromOrmResourceModel(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType ormCacheCoordinationType) {
-		if (ormCacheCoordinationType == null) {
-			return null;
-		}
-		switch (ormCacheCoordinationType) {
-			case SEND_OBJECT_CHANGES:
-				return SEND_OBJECT_CHANGES;
-			case INVALIDATE_CHANGED_OBJECTS:
-				return INVALIDATE_CHANGED_OBJECTS;
-			case SEND_NEW_OBJECTS_WITH_CHANGES:
-				return SEND_NEW_OBJECTS_WITH_CHANGES;
-			case NONE:
-				return NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache coordination type: " + ormCacheCoordinationType); //$NON-NLS-1$
-		}
-	}
-	
-	public static org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType toOrmResourceModel(EclipseLinkCacheCoordinationType cacheCoordinationType) {
-		if (cacheCoordinationType == null) {
-			return null;
-		}
-		switch (cacheCoordinationType) {
-			case SEND_OBJECT_CHANGES:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType.SEND_OBJECT_CHANGES;
-			case INVALIDATE_CHANGED_OBJECTS:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType.INVALIDATE_CHANGED_OBJECTS;
-			case SEND_NEW_OBJECTS_WITH_CHANGES:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType.SEND_NEW_OBJECTS_WITH_CHANGES;
-			case NONE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType.NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache coordination type: " + cacheCoordinationType); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCacheType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCacheType.java
deleted file mode 100644
index 921db50bdd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCacheType.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-
-/**
- * 
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum EclipseLinkCacheType {
-
-	SOFT_WEAK,
-	HARD_WEAK,
-	WEAK,
-	SOFT,
-	FULL,
-	CACHE,
-	NONE;
-	
-
-	public static EclipseLinkCacheType fromJavaResourceModel(org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType javaCacheType) {
-		if (javaCacheType == null) {
-			return null;
-		}
-		switch (javaCacheType) {
-			case FULL:
-				return FULL;
-			case WEAK:
-				return WEAK;
-			case SOFT:
-				return SOFT;
-			case SOFT_WEAK:
-				return SOFT_WEAK;
-			case HARD_WEAK:
-				return HARD_WEAK;
-			case CACHE:
-				return CACHE;
-			case NONE:
-				return NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache type: " + javaCacheType); //$NON-NLS-1$
-		}
-	}
-
-	public static org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType toJavaResourceModel(EclipseLinkCacheType cacheType) {
-		if (cacheType == null) {
-			return null;
-		}
-		switch (cacheType) {
-			case FULL:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType.FULL;
-			case WEAK:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType.WEAK;
-			case SOFT:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType.SOFT;
-			case SOFT_WEAK:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType.SOFT_WEAK;
-			case HARD_WEAK:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType.HARD_WEAK;
-			case CACHE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType.CACHE;
-			case NONE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType.NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache type: " + cacheType); //$NON-NLS-1$
-		}
-	}
-	
-
-	public static EclipseLinkCacheType fromOrmResourceModel(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType ormCacheType) {
-		if (ormCacheType == null) {
-			return null;
-		}
-		switch (ormCacheType) {
-			case FULL:
-				return FULL;
-			case WEAK:
-				return WEAK;
-			case SOFT:
-				return SOFT;
-			case SOFT_WEAK:
-				return SOFT_WEAK;
-			case HARD_WEAK:
-				return HARD_WEAK;
-			case CACHE:
-				return CACHE;
-			case NONE:
-				return NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache type: " + ormCacheType); //$NON-NLS-1$
-		}
-	}
-	
-	public static org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType toOrmResourceModel(EclipseLinkCacheType cacheType) {
-		if (cacheType == null) {
-			return null;
-		}
-		switch (cacheType) {
-			case FULL:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType.FULL;
-			case WEAK:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType.WEAK;
-			case SOFT:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType.SOFT;
-			case SOFT_WEAK:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType.SOFT_WEAK;
-			case HARD_WEAK:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType.HARD_WEAK;
-			case CACHE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType.CACHE;
-			case NONE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType.NONE;
-			default:
-				throw new IllegalArgumentException("unknown cache type: " + cacheType); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCaching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCaching.java
deleted file mode 100644
index 81fe325846..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCaching.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * EclipseLink caching
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-// TODO bjv EclipseLinkCachingPolicy
-public interface EclipseLinkCaching
-	extends JpaContextNode
-{
-	// ********** type **********
-
-	/**
-	 * This is the combination of defaultType and specifiedType.
-	 * If getSpecifiedType() returns null, then return getDefaultType()
-	 */
-	EclipseLinkCacheType getType();
-	
-	EclipseLinkCacheType getSpecifiedType();	
-	void setSpecifiedType(EclipseLinkCacheType type);
-		String SPECIFIED_TYPE_PROPERTY = "specifiedType"; //$NON-NLS-1$
-	
-	EclipseLinkCacheType getDefaultType();		
-		String DEFAULT_TYPE_PROPERTY = "defaultType"; //$NON-NLS-1$
-		EclipseLinkCacheType DEFAULT_TYPE = EclipseLinkCacheType.SOFT_WEAK;
-		
-	
-	// ********** size **********
-			
-	/**
-	 * This is the combination of defaultSize and specifiedSize.
-	 * If getSpecifiedSize() returns null, then return getDefaultSize()
-	 */
-	int getSize();
-
-	Integer getSpecifiedSize();
-	void setSpecifiedSize(Integer size);
-		String SPECIFIED_SIZE_PROPERTY = "specifiedSize"; //$NON-NLS-1$
-	
-	int getDefaultSize();
-		String DEFAULT_SIZE_PROPERTY = "defaultSize"; //$NON-NLS-1$
-		int DEFAULT_SIZE = 100;
-
-
-	// ********** shared **********
-	
-	/**
-	 * This is the combination of defaultShared and specifiedShared.
-	 * If getSpecifiedShared() returns null, then return isDefaultShared()
-	 */
-	boolean isShared();
-	
-	Boolean getSpecifiedShared();
-	
-	/**
-	 * Specifying <em>shared</em> <code>false</code> will return the following
-	 * caching settings to their defaults:<ul>
-	 * <li>type
-	 * <li>size
-	 * <li>always refresh
-	 * <li>refresh only if newer
-	 * <li>disable hits
-	 * <li>coordination type
-	 * </ul>
-	 * Additionally, the following settings will be cleared:<ul>
-	 * <li>expiry
-	 * <li>expiry time of day
-	 * </ul>
-	 * These settings do not apply to an unchared cache.
-	 */
-	void setSpecifiedShared(Boolean shared);
-		String SPECIFIED_SHARED_PROPERTY = "specifiedShared"; //$NON-NLS-1$
-	
-	boolean isDefaultShared();
-		String DEFAULT_SHARED_PROPERTY = "defaultShared"; //$NON-NLS-1$
-		boolean DEFAULT_SHARED = true;
-	
-	
-	// ********** always refresh **********
-		
-	/**
-	 * This is the combination of defaultAlwaysRefresh and specifiedAlwaysRefresh.
-	 * If getSpecifiedAlwaysRefresh() returns null, then return isDefaultAlwaysRefresh()
-	 */
-	boolean isAlwaysRefresh();
-	
-	Boolean getSpecifiedAlwaysRefresh();
-	void setSpecifiedAlwaysRefresh(Boolean alwaysRefresh);
-		String SPECIFIED_ALWAYS_REFRESH_PROPERTY = "specifiedAlwaysRefresh"; //$NON-NLS-1$
-
-	boolean isDefaultAlwaysRefresh();
-		String DEFAULT_ALWAYS_REFRESH_PROPERTY = "defaultAlwaysRefresh"; //$NON-NLS-1$
-		boolean DEFAULT_ALWAYS_REFRESH = false;
-	
-
-	// ********** refresh only if newer **********
-		
-	/**
-	 * This is the combination of defaultRefreshOnlyIfNewer and specifiedRefreshOnlyIfNewer.
-	 * If getSpecifiedRefreshOnlyIfNewer() returns null, then return isDefaultRefreshOnlyIfNewer()
-	 */
-	boolean isRefreshOnlyIfNewer();
-	
-	Boolean getSpecifiedRefreshOnlyIfNewer();
-	void setSpecifiedRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer);
-		String SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY = "specifiedRefreshOnlyIfNewer"; //$NON-NLS-1$
-
-	boolean isDefaultRefreshOnlyIfNewer();
-		String DEFAULT_REFRESH_ONLY_IF_NEWER_PROPERTY = "defaultRefreshOnlyIfNewer"; //$NON-NLS-1$
-		boolean DEFAULT_REFRESH_ONLY_IF_NEWER = false;
-	
-		
-	// ********** disable hits **********
-		
-	/**
-	 * This is the combination of defaultDisableHits and specifiedDisableHits.
-	 * If getSpecifiedDisableHits() returns null, then return getDefaultDisableHits()
-	 */
-	boolean isDisableHits();
-	
-	Boolean getSpecifiedDisableHits();
-	void setSpecifiedDisableHits(Boolean disableHits);
-		String SPECIFIED_DISABLE_HITS_PROPERTY = "specifiedDisableHits"; //$NON-NLS-1$
-
-	boolean isDefaultDisableHits();
-		String DEFAULT_DISABLE_HITS_PROPERTY = "defaultDisableHits"; //$NON-NLS-1$
-		boolean DEFAULT_DISABLE_HITS = false;
-	
-		
-	// ********** coordination type **********
-	
-	/**
-	 * This is the combination of defaultCoordinationType and specifiedCoordinationType.
-	 * If getSpecifiedCoordinationType() returns null, then return getDefaultCoordinationType()
-	 */
-	EclipseLinkCacheCoordinationType getCoordinationType();
-	
-	EclipseLinkCacheCoordinationType getSpecifiedCoordinationType();	
-	void setSpecifiedCoordinationType(EclipseLinkCacheCoordinationType coordinationType);
-		String SPECIFIED_COORDINATION_TYPE_PROPERTY = "specifiedCoordinationType"; //$NON-NLS-1$
-
-	EclipseLinkCacheCoordinationType getDefaultCoordinationType();		
-		String DEFAULT_COORDINATION_TYPE_PROPERTY = "defaultCoordinationType"; //$NON-NLS-1$
-		EclipseLinkCacheCoordinationType DEFAULT_COORDINATION_TYPE = EclipseLinkCacheCoordinationType.SEND_OBJECT_CHANGES;
-
-		
-	// ********** expiry **********
-
-	/**
-	 * corresponds to the Cache expiry element.  If this returns
-	 * a non-null value then getExpiryTimeOfDay will return null.
-	 * It is not valid to specify both
-	 */
-	Integer getExpiry();
-	
-	/**
-	 * Setting this to a non-null value will set timeOfDayExpiry to null
-	 */
-	void setExpiry(Integer expiry);
-		String EXPIRY_PROPERTY = "expiry"; //$NON-NLS-1$
-	
-		
-	// ********** expiry time of day **********
-
-	/**
-	 * corresponds to the Cache expiryTimeOfDay annotation or xml element.  
-	 * If this returns a non-null value then getExpiry will return null.
-	 * It is not valid to specify both.
-	 */
-	EclipseLinkTimeOfDay getExpiryTimeOfDay();
-		String EXPIRY_TIME_OF_DAY_PROPERTY = "expiryTimeOfDay"; //$NON-NLS-1$
-	
-	/**
-	 * Add Cache expiryTimeOfDay annotation or xml element, this will set 
-	 * Expiry to null as it is not valid to set both expiry and timeOfDayExpiry
-	 */
-	EclipseLinkTimeOfDay addExpiryTimeOfDay();
-	
-	/**
-	 * Removes the Cache expiryTimeOfDay annotation/xml element
-	 */
-	void removeExpiryTimeOfDay();
-	
-
-	// ********** existence type **********
-	// TODO bjv rename existenceCheckingPolicy
-	/**
-	 * This is the combination of defaultExistenceType and specifiedExistenceType.
-	 * If getSpecifiedExistenceType() returns null, then return getDefaultExistenceType()
-	 */
-	EclipseLinkExistenceType getExistenceType();
-	
-	EclipseLinkExistenceType getSpecifiedExistenceType();	
-	void setSpecifiedExistenceType(EclipseLinkExistenceType type);
-		String SPECIFIED_EXISTENCE_TYPE_PROPERTY = "specifiedExistenceType"; //$NON-NLS-1$
-
-	EclipseLinkExistenceType getDefaultExistenceType();		
-		String DEFAULT_EXISTENCE_TYPE_PROPERTY = "defaultExistenceType"; //$NON-NLS-1$
-		EclipseLinkExistenceType DEFAULT_EXISTENCE_TYPE = EclipseLinkExistenceType.CHECK_DATABASE;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkChangeTracking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkChangeTracking.java
deleted file mode 100644
index bf4afe83cd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkChangeTracking.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * EclipseLink change tracking
- * <p>
- * 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.
- *
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkChangeTracking
-	extends JpaContextNode
-{
-	/**
-	 * Return the specified type if it is present, otherwise return the default
-	 * type.
-	 */
-	EclipseLinkChangeTrackingType getType();
-
-	EclipseLinkChangeTrackingType getSpecifiedType();
-	void setSpecifiedType(EclipseLinkChangeTrackingType type);
-		String SPECIFIED_TYPE_PROPERTY = "specifiedType"; //$NON-NLS-1$
-
-	EclipseLinkChangeTrackingType getDefaultType();
-		String DEFAULT_TYPE_PROPERTY = "defaultType"; //$NON-NLS-1$
-		EclipseLinkChangeTrackingType DEFAULT_TYPE = EclipseLinkChangeTrackingType.AUTO;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkChangeTrackingType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkChangeTrackingType.java
deleted file mode 100644
index 114d5a75f6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkChangeTrackingType.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType;
-
-
-/**
- * 
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum EclipseLinkChangeTrackingType {
-
-	ATTRIBUTE,
-	OBJECT,
-	DEFERRED,
-	AUTO;
-	
-
-	public static EclipseLinkChangeTrackingType fromJavaResourceModel(org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType javaChangeTrackingType) {
-		if (javaChangeTrackingType == null) {
-			return null;
-		}
-		switch (javaChangeTrackingType) {
-			case ATTRIBUTE:
-				return ATTRIBUTE;
-			case OBJECT:
-				return OBJECT;
-			case DEFERRED:
-				return DEFERRED;
-			case AUTO:
-				return AUTO;
-			default:
-				throw new IllegalArgumentException("unknown change tracking type: " + javaChangeTrackingType); //$NON-NLS-1$
-		}
-	}
-
-	public static org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType toJavaResourceModel(EclipseLinkChangeTrackingType changeTrackingType) {
-		if (changeTrackingType == null) {
-			return null;
-		}
-		switch (changeTrackingType) {
-			case ATTRIBUTE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType.ATTRIBUTE;
-			case OBJECT:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType.OBJECT;
-			case DEFERRED:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType.DEFERRED;
-			case AUTO:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType.AUTO;
-			default:
-				throw new IllegalArgumentException("unknown change tracking type: " + changeTrackingType); //$NON-NLS-1$
-		}
-	}
-	
-	public static EclipseLinkChangeTrackingType fromOrmResourceModel(XmlChangeTrackingType ormChangeTrackingType) {
-		if (ormChangeTrackingType == null) {
-			return null;
-		}
-		switch (ormChangeTrackingType) {
-			case ATTRIBUTE:
-				return ATTRIBUTE;
-			case OBJECT:
-				return OBJECT;
-			case DEFERRED:
-				return DEFERRED;
-			case AUTO:
-				return AUTO;
-			default:
-				throw new IllegalArgumentException("unknown change tracking type: " + ormChangeTrackingType); //$NON-NLS-1$
-		}
-	}
-	
-	public static XmlChangeTrackingType toOrmResourceModel(EclipseLinkChangeTrackingType changeTrackingType) {
-		if (changeTrackingType == null) {
-			return null;
-		}
-		switch (changeTrackingType) {
-			case ATTRIBUTE:
-				return XmlChangeTrackingType.ATTRIBUTE;
-			case OBJECT:
-				return XmlChangeTrackingType.OBJECT;
-			case DEFERRED:
-				return XmlChangeTrackingType.DEFERRED;
-			case AUTO:
-				return XmlChangeTrackingType.AUTO;
-			default:
-				throw new IllegalArgumentException("unknown change tracking type: " + changeTrackingType); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConversionValue.java
deleted file mode 100644
index 3234114a92..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConversionValue.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * Corresponds to a ConversionValue resource model object
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkConversionValue
-	extends JpaContextNode
-{
-	EclipseLinkObjectTypeConverter getParent();
-
-	String getDataValue();	
-	void setDataValue(String dataValue);
-		String DATA_VALUE_PROPERTY = "dataValue"; //$NON-NLS-1$
-		
-	String getObjectValue();	
-	void setObjectValue(String objectValue);
-		String OBJECT_VALUE_PROPERTY = "objectValue"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java
deleted file mode 100644
index 2d004387a0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.Converter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-
-/**
- * EclipseLink convert (not to be confused with EclipseLink converter)
- * <p>
- * 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.
- * 
- * @version 3.1
- * @since 2.1
- */
-public interface EclipseLinkConvert
-	extends Converter
-{
-
-	EclipseLinkPersistenceUnit getPersistenceUnit();
-
-	String getConverterName();
-	
-	String getSpecifiedConverterName();
-	void setSpecifiedConverterName(String converterName);
-		String SPECIFIED_CONVERTER_NAME_PROPERTY = "specifiedConverterName"; //$NON-NLS-1$
-	
-	String getDefaultConverterName();
-		String DEFAULT_CONVERTER_NAME_PROPERTY = "defaultConverterName"; //$NON-NLS-1$
-
-	/**
-	 * Reserved name for specifying a serialized object converter.
-	 * In this case a corresponding @CustomConverter is unnecessary.
-	 */
-	String SERIALIZED_CONVERTER = "serialized"; //$NON-NLS-1$
-	
-	/**
-	 * Reserved name for specifying a class instance converter.
-	 * Will use a ClassInstanceConverter
-	 * on the associated mapping. When using a ClassInstanceConverter the database representation is a 
-	 * String representing the Class name and the object-model representation is an instance 
-	 * of that class built with the zero-argument constructor.
-	 * In this case a corresponding @CustomConverter is unnecessary.
-	 */
-	String CLASS_INSTANCE_CONVERTER = "class-instance"; //$NON-NLS-1$
-	
-	/**
-	 * Reserved name for specifying no converter.
-	 * This can be used to override a situation where either 
-	 * another converter is defaulted or another converter is set.
-	 * In this case a corresponding @CustomConverter is unnecessary.
-	 */
-	String NO_CONVERTER = "none"; //$NON-NLS-1$
-	
-	String[] RESERVED_CONVERTER_NAMES = {NO_CONVERTER, CLASS_INSTANCE_CONVERTER, SERIALIZED_CONVERTER};
-	
-	String DEFAULT_CONVERTER_NAME = NO_CONVERTER;
-
-	/**
-	 * Return the mapping's converter.
-	 */
-	EclipseLinkConverter getConverter();
-		String CONVERTER_PROPERTY = "converter"; //$NON-NLS-1$
-	
-	/**
-	 * Possible values for the converter type are:<ul>
-	 * <li>{@link EclipseLinkCustomConverter}
-	 * <li>{@link EclipseLinkTypeConverter}
-	 * <li>{@link EclipseLinkObjectTypeConverter}
-	 * <li>{@link EclipseLinkStructConverter}
-	 * <li><code>null</code>
-	 * </ul>
-	 */
-	void setConverter(Class<? extends EclipseLinkConverter> converterType);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverter.java
deleted file mode 100644
index 24cec662b1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode;
-
-/**
- * EclipseLink converter:<ul>
- * <li>Type ({@link EclipseLinkTypeConverter})
- * <li>Object Type ({@link EclipseLinkObjectTypeConverter})
- * <li>Struct ({@link EclipseLinkStructConverter})
- * <li>Custom ({@link EclipseLinkCustomConverter})
- * </ul>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkConverter
-	extends JpaNamedContextNode
-{
-	/**
-	 * Return the converter's type.
-	 */
-	Class<? extends EclipseLinkConverter> getType();
-		@SuppressWarnings("unchecked")
-		Iterable<Class<? extends EclipseLinkConverter>> TYPES = new ArrayIterable<Class<? extends EclipseLinkConverter>>(
-			EclipseLinkCustomConverter.class,
-			EclipseLinkObjectTypeConverter.class,
-			EclipseLinkStructConverter.class,
-			EclipseLinkTypeConverter.class
-		);
-		
-
-	/**
-	 * Return the character to be used for browsing or creating the converter
-	 * class {@link org.eclipse.jdt.core.IType IType}.
-	 * @see org.eclipse.jdt.core.IType#getFullyQualifiedName(char)
-	 */
-	char getEnclosingTypeSeparator();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverterClassConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverterClassConverter.java
deleted file mode 100644
index f257947605..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConverterClassConverter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-/**
- * Corresponds to a *ConverterClassConverter resource model object
- * 
- * 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.
- * 
- * @version 2.4
- * @since 2.4
- */
-
-public interface EclipseLinkConverterClassConverter
-	extends EclipseLinkConverter
-{
-	String getConverterClass();	
-		String CONVERTER_CLASS_PROPERTY = "converterClass"; //$NON-NLS-1$
-	void setConverterClass(String converterClass);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCustomConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCustomConverter.java
deleted file mode 100644
index ed43b5cacc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCustomConverter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-/**
- * EclipseLink custom converter
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkCustomConverter
-	extends EclipseLinkConverterClassConverter
-{
-	String ECLIPSELINK_CONVERTER_CLASS_NAME = "org.eclipse.persistence.mappings.converters.Converter"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCustomizer.java
deleted file mode 100644
index e174e1d23a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCustomizer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * Corresponds to a Customizer resource model object
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkCustomizer
-	extends JpaContextNode
-{
-	String getCustomizerClass();
-	
-	String getSpecifiedCustomizerClass();	
-	void setSpecifiedCustomizerClass(String customizerClass);
-		String SPECIFIED_CUSTOMIZER_CLASS_PROPERTY = "specifiedCustomizerClass"; //$NON-NLS-1$
-		String ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME = "org.eclipse.persistence.config.DescriptorCustomizer"; //$NON-NLS-1$
-
-	String getDefaultCustomizerClass();
-		String DEFAULT_CUSTOMIZER_CLASS_PROPERTY = "defaultCustomizerClass"; //$NON-NLS-1$
-	
-	/**
-	 * Return the char to be used for browsing or creating the customizer class IType.
-	 * @see org.eclipse.jdt.core.IType#getFullyQualifiedName(char)
-	 */
-	char getCustomizerClassEnclosingTypeSeparator();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkEmbeddable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkEmbeddable.java
deleted file mode 100644
index cb838dc67c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkEmbeddable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.Embeddable;
-
-/**
- * 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.
- * 
- * @version 2.3
- * @since 2.1
- */
-public interface EclipseLinkEmbeddable 
-	extends Embeddable, EclipseLinkTypeMapping
-{
-	// combine various interfaces
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkEntity.java
deleted file mode 100644
index 034e32126c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.Entity;
-
-/**
- * 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.
- * 
- * @version 2.3
- * @since 2.1
- */
-public interface EclipseLinkEntity
-	extends Entity, EclipseLinkNonEmbeddableTypeMapping
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkExistenceType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkExistenceType.java
deleted file mode 100644
index 8d5698ee5e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkExistenceType.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-
-/**
- * 
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-// TODO bjv rename to EclipseLinkExistenceCheckingPolicy
-public enum EclipseLinkExistenceType {
-
-    CHECK_CACHE,
-    CHECK_DATABASE,
-    ASSUME_EXISTENCE,
-    ASSUME_NON_EXISTENCE;
-	
-
-	public static EclipseLinkExistenceType fromJavaResourceModel(org.eclipse.jpt.jpa.eclipselink.core.resource.java.ExistenceType javaExistenceType) {
-		if (javaExistenceType == null) {
-			return null;
-		}
-		switch (javaExistenceType) {
-			case CHECK_CACHE:
-				return CHECK_CACHE;
-			case CHECK_DATABASE:
-				return CHECK_DATABASE;
-			case ASSUME_EXISTENCE:
-				return ASSUME_EXISTENCE;
-			case ASSUME_NON_EXISTENCE:
-				return ASSUME_NON_EXISTENCE;
-			default:
-				throw new IllegalArgumentException("unknown existence type: " + javaExistenceType); //$NON-NLS-1$
-		}
-	}
-
-	public static org.eclipse.jpt.jpa.eclipselink.core.resource.java.ExistenceType toJavaResourceModel(EclipseLinkExistenceType existenceType) {
-		if (existenceType == null) {
-			return null;
-		}
-		switch (existenceType) {
-			case CHECK_CACHE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.ExistenceType.CHECK_CACHE;
-			case CHECK_DATABASE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.ExistenceType.CHECK_DATABASE;
-			case ASSUME_EXISTENCE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.ExistenceType.ASSUME_EXISTENCE;
-			case ASSUME_NON_EXISTENCE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.ExistenceType.ASSUME_NON_EXISTENCE;
-			default:
-				throw new IllegalArgumentException("unknown existence type: " + existenceType); //$NON-NLS-1$
-		}
-	}
-	
-
-	public static EclipseLinkExistenceType fromOrmResourceModel(org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType ormExistenceType) {
-		if (ormExistenceType == null) {
-			return null;
-		}
-		switch (ormExistenceType) {
-			case CHECK_CACHE:
-				return CHECK_CACHE;
-			case CHECK_DATABASE:
-				return CHECK_DATABASE;
-			case ASSUME_EXISTENCE:
-				return ASSUME_EXISTENCE;
-			case ASSUME_NON_EXISTENCE:
-				return ASSUME_NON_EXISTENCE;
-			default:
-				throw new IllegalArgumentException("unknown existence type: " + ormExistenceType); //$NON-NLS-1$
-		}
-	}
-	
-	public static org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType toOrmResourceModel(EclipseLinkExistenceType existenceType) {
-		if (existenceType == null) {
-			return null;
-		}
-		switch (existenceType) {
-			case CHECK_CACHE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType.CHECK_CACHE;
-			case CHECK_DATABASE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType.CHECK_DATABASE;
-			case ASSUME_EXISTENCE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType.ASSUME_EXISTENCE;
-			case ASSUME_NON_EXISTENCE:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType.ASSUME_NON_EXISTENCE;
-			default:
-				throw new IllegalArgumentException("unknown existence type: " + existenceType); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkIdMapping.java
deleted file mode 100644
index 6fb10b2554..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkIdMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.IdMapping;
-
-/**
- * EclipseLink ID mapping
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkIdMapping
-	extends IdMapping
-{
-	EclipseLinkMutable getMutable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetch.java
deleted file mode 100644
index 44fa1cf3f1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetch.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkJoinFetch
-	extends JpaContextNode
-{
-	EclipseLinkJoinFetchType getValue();
-	void setValue(EclipseLinkJoinFetchType value);
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-		EclipseLinkJoinFetchType DEFAULT_VALUE = EclipseLinkJoinFetchType.INNER;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetchMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetchMapping.java
deleted file mode 100644
index 77966f4d37..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetchMapping.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-
-/**
- * EclipseLink join-fetch mapping.
- * <p>
- * 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 interface EclipseLinkJoinFetchMapping
-	extends AttributeMapping
-{
-	EclipseLinkJoinFetch getJoinFetch();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetchType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetchType.java
deleted file mode 100644
index b61a2c825b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkJoinFetchType.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType;
-
-/**
- * 
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum EclipseLinkJoinFetchType {
-
-	INNER,
-	OUTER;
-	
-
-	public static EclipseLinkJoinFetchType fromJavaResourceModel(org.eclipse.jpt.jpa.eclipselink.core.resource.java.JoinFetchType javaJoinFetchType) {
-		if (javaJoinFetchType == null) {
-			return null;
-		}
-		switch (javaJoinFetchType) {
-			case INNER:
-				return INNER;
-			case OUTER:
-				return OUTER;
-			default:
-				throw new IllegalArgumentException("unknown join fetch type: " + javaJoinFetchType); //$NON-NLS-1$
-		}
-	}
-
-	public static org.eclipse.jpt.jpa.eclipselink.core.resource.java.JoinFetchType toJavaResourceModel(EclipseLinkJoinFetchType joinFetchType) {
-		if (joinFetchType == null) {
-			return null;
-		}
-		switch (joinFetchType) {
-			case INNER:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.JoinFetchType.INNER;
-			case OUTER:
-				return org.eclipse.jpt.jpa.eclipselink.core.resource.java.JoinFetchType.OUTER;
-			default:
-				throw new IllegalArgumentException("unknown join fetch type: " + joinFetchType); //$NON-NLS-1$
-		}
-	}
-	
-
-	public static EclipseLinkJoinFetchType fromOrmResourceModel(XmlJoinFetchType ormJoinFetchType) {
-		if (ormJoinFetchType == null) {
-			return null;
-		}
-		switch (ormJoinFetchType) {
-			case INNER:
-				return INNER;
-			case OUTER:
-				return OUTER;
-			default:
-				throw new IllegalArgumentException("unknown join fetch type: " + ormJoinFetchType); //$NON-NLS-1$
-		}
-	}
-	
-	public static XmlJoinFetchType toOrmResourceModel(EclipseLinkJoinFetchType fetchType) {
-		if (fetchType == null) {
-			return null;
-		}
-		switch (fetchType) {
-			case INNER:
-				return XmlJoinFetchType.INNER;
-			case OUTER:
-				return XmlJoinFetchType.OUTER;
-			default:
-				throw new IllegalArgumentException("unknown join fetch type: " + fetchType); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMappedSuperclass.java
deleted file mode 100644
index c417475cc4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMappedSuperclass.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
-
-/**
- * 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.
- * 
- * @version 2.3
- * @since 2.1
- */
-public interface EclipseLinkMappedSuperclass
-	extends MappedSuperclass, EclipseLinkNonEmbeddableTypeMapping
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMutable.java
deleted file mode 100644
index 1611e608be..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMutable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkMutable
-	extends JpaContextNode
-{
-	boolean isMutable();
-	
-	Boolean getSpecifiedMutable();
-	void setSpecifiedMutable(Boolean mutable);
-		String SPECIFIED_MUTABLE_PROPERTY = "specifiedMutable";  //$NON-NLS-1$
-	
-	boolean isDefaultMutable();
-		String DEFAULT_MUTABLE_PROPERTY = "defaultMutable";  //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkNonEmbeddableTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkNonEmbeddableTypeMapping.java
deleted file mode 100644
index b489b3c166..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkNonEmbeddableTypeMapping.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-/**
- * EclipseLink non-embeddable type mapping
- * <p>
- * 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 interface EclipseLinkNonEmbeddableTypeMapping
-	extends EclipseLinkTypeMapping
-{
-	EclipseLinkCaching getCaching();
-
-	EclipseLinkReadOnly getReadOnly();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkObjectTypeConverter.java
deleted file mode 100644
index bad5521ebe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkObjectTypeConverter.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-
-/**
- * EclipseLink object type converter
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkObjectTypeConverter
-	extends EclipseLinkConverter
-{
-	// ********** data type **********
-
-	String getDataType();	
-	void setDataType(String dataType);
-		String DATA_TYPE_PROPERTY = "dataType"; //$NON-NLS-1$
-		
-	
-	// ********** object type **********
-
-	String getObjectType();	
-	void setObjectType(String objectType);
-		String OBJECT_TYPE_PROPERTY = "objectType"; //$NON-NLS-1$
-
-	
-	// ********** conversion values **********
-
-	/**
-	 * Return the converter's conversion values.
-	 */
-	ListIterable<? extends EclipseLinkConversionValue> getConversionValues();
-		String CONVERSION_VALUES_LIST = "conversionValues"; //$NON-NLS-1$
-
-	/**
-	 * Return the number of conversion values.
-	 */
-	int getConversionValuesSize();
-
-	/**
-	 * Add a conversion value to the converter at the specified index
-	 * and return it.
-	 */
-	EclipseLinkConversionValue addConversionValue(int index);
-
-	/**
-	 * Add a conversion value to the converter and return it.
-	 */
-	EclipseLinkConversionValue addConversionValue();
-
-	/**
-	 * Remove the conversion value at the specified index.
-	 */
-	void removeConversionValue(int index);
-
-	/**
-	 * Remove the specified conversion value.
-	 */
-	void removeConversionValue(EclipseLinkConversionValue conversionValue);
-
-	/**
-	 * Move the conversion value from the specified source index to the
-	 * specified target index.
-	 */
-	void moveConversionValue(int targetIndex, int sourceIndex);
-
-
-	// ********** data values **********
-
-	/**
-	 * Return the converter's data values.
-	 */
-	Iterable<String> getDataValues();
-
-	/**
-	 * Return the number of data values.
-	 */
-	int getDataValuesSize();
-
-	
-	// ********** default object value **********
-	
-	String getDefaultObjectValue();
-	void setDefaultObjectValue(String value);
-		String DEFAULT_OBJECT_VALUE_PROPERTY = "defaultObjectValue"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToManyMapping.java
deleted file mode 100644
index a58b71be8f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToManyMapping.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-
-/**
- * EclipseLink 1:m mapping
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkOneToManyMapping 
-	extends OneToManyMapping, EclipseLinkRelationshipMapping
-{
-	EclipseLinkOneToManyRelationship getRelationship();
-	
-	EclipseLinkPrivateOwned getPrivateOwned();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToManyRelationship.java
deleted file mode 100644
index 214b6128cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToManyRelationship.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JoinColumnRelationship;
-import org.eclipse.jpt.jpa.core.context.OneToManyRelationship;
-
-/**
- * EclipseLink 1:m relationship
- * <p>
- * 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.
- * 
- * @version 2.2
- * @since 2.2
- */
-public interface EclipseLinkOneToManyRelationship
-	extends OneToManyRelationship,
-			JoinColumnRelationship
-{
-	// add join column support to JPA 1.0 1:m
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToOneMapping.java
deleted file mode 100644
index 846192a66e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkOneToOneMapping.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.OneToOneRelationship;
-
-/**
- * EclipseLink 1:1 mapping
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkOneToOneMapping
-	extends OneToOneMapping, EclipseLinkRelationshipMapping
-{
-	OneToOneRelationship getRelationship();
-
-	EclipseLinkPrivateOwned getPrivateOwned();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkPrivateOwned.java
deleted file mode 100644
index 4a3b7f924c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkPrivateOwned.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkPrivateOwned
-	extends JpaContextNode
-{
-	boolean isPrivateOwned();
-	void setPrivateOwned(boolean privateOwned);
-		String PRIVATE_OWNED_PROPERTY = "privateOwned"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkReadOnly.java
deleted file mode 100644
index 28d212495a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkReadOnly.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * EclipseLink read-only
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkReadOnly
-	extends JpaContextNode
-{
-	boolean isReadOnly();
-
-	boolean isDefaultReadOnly();
-		String DEFAULT_READ_ONLY_PROPERTY = "defaultReadOnly"; //$NON-NLS-1$
-		boolean DEFAULT_READ_ONLY = false;
-
-	Boolean getSpecifiedReadOnly();
-	void setSpecifiedReadOnly(Boolean newSpecifiedReadOnly);
-		String SPECIFIED_READ_ONLY_PROPERTY = "specifiedReadOnly"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkRelationshipMapping.java
deleted file mode 100644
index 9f349118f5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkRelationshipMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.RelationshipMapping;
-
-/**
- * EclipseLink relationship (1:1, 1:m, m:1, m:m) mapping.
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkRelationshipMapping 
-	extends RelationshipMapping, EclipseLinkJoinFetchMapping
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkStructConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkStructConverter.java
deleted file mode 100644
index b9c13484c3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkStructConverter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-/**
- * EclipseLink struct converter
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkStructConverter extends EclipseLinkConverterClassConverter
-{
-		String ECLIPSELINK_STRUCT_CONVERTER_CLASS_NAME = "org.eclipse.persistence.platform.database.converters.StructConverter"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTimeOfDay.java
deleted file mode 100644
index 12b7a15e56..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTimeOfDay.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-
-/**
- * EclipseLink caching expiry time of day
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkTimeOfDay
-	extends JpaContextNode
-{
-	Integer getHour();
-	void setHour(Integer hour);
-		String HOUR_PROPERTY = "hour"; //$NON-NLS-1$
-
-	Integer getMinute();
-	void setMinute(Integer minute);
-		String MINUTE_PROPERTY = "minute"; //$NON-NLS-1$
-	
-	Integer getSecond();
-	void setSecond(Integer second);
-		String SECOND_PROPERTY = "second"; //$NON-NLS-1$
-	
-	Integer getMillisecond();
-	void setMillisecond(Integer millisecond);
-		String MILLISECOND_PROPERTY = "millisecond"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTransformationMapping.java
deleted file mode 100644
index 972fdebb9a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTransformationMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-
-/**
- * EclipseLink transformation mapping
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkTransformationMapping
-	extends AttributeMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTypeConverter.java
deleted file mode 100644
index e215cdea53..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTypeConverter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-/**
- * EclipseLink type converter
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkTypeConverter
-	extends EclipseLinkConverter
-{
-	String getDataType();	
-	void setDataType(String dataType);
-		String DATA_TYPE_PROPERTY = "dataType"; //$NON-NLS-1$
-		
-	String getObjectType();	
-	void setObjectType(String objectType);
-		String OBJECT_TYPE_PROPERTY = "objectType"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTypeMapping.java
deleted file mode 100644
index 7c4c016beb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTypeMapping.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.common.utility.internal.Transformer;
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.Converter;
-import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
-import org.eclipse.jpt.jpa.core.context.TypeMapping;
-
-/**
- * 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.
- * 
- * @version 2.3
- * @since 2.3
- */
-public interface EclipseLinkTypeMapping
-	extends TypeMapping
-{
-	EclipseLinkCustomizer getCustomizer();
-	
-	EclipseLinkChangeTracking getChangeTracking();
-
-	/**
-	 * Return whether this type mapping specifies primary key columns rather than using
-	 * JPA-style attributes
-	 * (Uses the @PrimaryKey annotation for java, or the primary-key element for xml)
-	 * 
-	 * Note: there is no context-level or UI support for this feature as of yet.
-	 * Note: this is a 1.1 feature, but this check has been implemented for all versions
-	 */
-	boolean usesPrimaryKeyColumns();
-
-	Iterable<EclipseLinkConverter> getConverters();
-
-	Transformer<AttributeMapping, EclipseLinkConverter> ATTRIBUTE_MAPPING_CONVERTER_TRANSFORMER =
-		new Transformer<AttributeMapping, EclipseLinkConverter>() {
-			public EclipseLinkConverter transform(AttributeMapping attributeMapping) {
-				if (attributeMapping instanceof ConvertibleMapping) {
-					Converter converter = ((ConvertibleMapping) attributeMapping).getConverter();
-					if ((converter != null) && (converter.getType() == EclipseLinkConvert.class)) {
-						return ((EclipseLinkConvert) converter).getConverter();
-					}
-				}
-				return null;
-			}
-		};
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkVariableOneToOneMapping.java
deleted file mode 100644
index 311a212512..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkVariableOneToOneMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-
-/**
- * EclipseLink variable 1:1 mapping
- * <p>
- * 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.
- * 
- * @version 2.2
- * @since 2.2
- */
-public interface EclipseLinkVariableOneToOneMapping
-	extends AttributeMapping
-{
-	// nothing yet
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkVersionMapping.java
deleted file mode 100644
index 549fc78bad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkVersionMapping.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context;
-
-import org.eclipse.jpt.jpa.core.context.VersionMapping;
-
-/**
- * EclipseLink version mapping
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkVersionMapping
-	extends VersionMapping
-{
-	EclipseLinkMutable getMutable();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/EclipseLinkJavaOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/EclipseLinkJavaOneToManyRelationship.java
deleted file mode 100644
index 09b8a1b8a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/EclipseLinkJavaOneToManyRelationship.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationship;
-import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyRelationship;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyRelationship;
-
-/**
- * EclipseLink Java 1:m relationship
- * <p>
- * 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 interface EclipseLinkJavaOneToManyRelationship
-	extends EclipseLinkOneToManyRelationship,
-			JavaOneToManyRelationship,
-			JavaJoinColumnRelationship
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/EclipseLinkJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/EclipseLinkJavaTypeMapping.java
deleted file mode 100644
index d7aa51e560..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/EclipseLinkJavaTypeMapping.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeMapping;
-
-/**
- * EclipseLink Java type mapping
- * <p>
- * 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 interface EclipseLinkJavaTypeMapping
-	extends JavaTypeMapping, EclipseLinkTypeMapping
-{
-	// this is pretty different from the orm container (so, no common super-interface)
-	JavaEclipseLinkConverterContainer getConverterContainer();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkCaching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkCaching.java
deleted file mode 100644
index be17d91a59..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkCaching.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCaching;
-
-/**
- * EclipseLink Java caching
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface JavaEclipseLinkCaching
-	extends EclipseLinkCaching, JavaJpaContextNode
-{
-	/**
-	 * Return true if the existence-checking model object exists.  
-	 * Have to have a separate flag for this since the default existence
-	 * type is different depending on whether hasExistenceChecking() returns
-	 * true or false.
-	 */
-	boolean isExistenceChecking();
-	void setExistenceChecking(boolean existenceChecking);
-		String EXISTENCE_CHECKING_PROPERTY = "existenceChecking"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkConverterContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkConverterContainer.java
deleted file mode 100644
index 66e9ff7002..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkConverterContainer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkCustomConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkObjectTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkStructConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkTypeConverter;
-
-/**
- * EclipseLink Java converter container
- * <p>
- * <strong>NB:</strong> This is only mildly-related to
- * {@link org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer};
- * thus the lack of common super-interface.
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.2
- */
-public interface JavaEclipseLinkConverterContainer
-	extends JavaJpaContextNode
-{
-	Iterable<EclipseLinkConverter> getConverters();
-
-	JavaEclipseLinkCustomConverter getCustomConverter();
-	JavaEclipseLinkCustomConverter addCustomConverter();
-	void removeCustomConverter();
-	String CUSTOM_CONVERTER_PROPERTY = "customConverter"; //$NON-NLS-1$
-	
-	JavaEclipseLinkObjectTypeConverter getObjectTypeConverter();
-	JavaEclipseLinkObjectTypeConverter addObjectTypeConverter();
-	void removeObjectTypeConverter();
-	String OBJECT_TYPE_CONVERTER_PROPERTY = "objectTypeConverter"; //$NON-NLS-1$
-	
-	JavaEclipseLinkStructConverter getStructConverter();
-	JavaEclipseLinkStructConverter addStructConverter();
-	void removeStructConverter();
-	String STRUCT_CONVERTER_PROPERTY = "structConverter"; //$NON-NLS-1$
-	
-	JavaEclipseLinkTypeConverter getTypeConverter();
-	JavaEclipseLinkTypeConverter addTypeConverter();
-	void removeTypeConverter();
-	String TYPE_CONVERTER_PROPERTY = "typeConverter"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkEmbeddable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkEmbeddable.java
deleted file mode 100644
index 80c3e43510..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkEmbeddable.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkEmbeddable;
-
-/**
- * EclipseLink
- * Java embeddable type mapping
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface JavaEclipseLinkEmbeddable
-	extends JavaEmbeddable, EclipseLinkEmbeddable, EclipseLinkJavaTypeMapping
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkEntity.java
deleted file mode 100644
index 32a78c5646..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkEntity;
-
-/**
- * EclipseLink
- * Java entity
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface JavaEclipseLinkEntity
-	extends JavaEntity, EclipseLinkEntity, JavaEclipseLinkNonEmbeddableTypeMapping
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkMappedSuperclass.java
deleted file mode 100644
index c5541c4fc7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkMappedSuperclass.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
-
-/**
- * EclipseLink
- * Java mapped superclass
- * <p>
- * 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.
- * 
- * @version 3.0
- * @since 2.1
- */
-public interface JavaEclipseLinkMappedSuperclass
-	extends JavaMappedSuperclass, EclipseLinkMappedSuperclass, JavaEclipseLinkNonEmbeddableTypeMapping
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkNonEmbeddableTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkNonEmbeddableTypeMapping.java
deleted file mode 100644
index a88d3c6dac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/java/JavaEclipseLinkNonEmbeddableTypeMapping.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.java;
-
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkNonEmbeddableTypeMapping;
-
-/**
- * EclipseLink Java non-embeddable type mapping
- * <p>
- * 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 interface JavaEclipseLinkNonEmbeddableTypeMapping
-	extends EclipseLinkNonEmbeddableTypeMapping, EclipseLinkJavaTypeMapping
-{
-	JavaEclipseLinkCaching getCaching();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkEntityMappings.java
deleted file mode 100644
index 4dc01fcd8a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkEntityMappings.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-
-public interface EclipseLinkEntityMappings 
-	extends EntityMappings
-{
-	/**
-	 * Return all the converters defined in both the entity mappings and its
-	 * entities (but <em>not</em> in any associated Java annotations).
-	 */
-	Iterable<EclipseLinkConverter> getMappingFileConverters();
-
-	OrmEclipseLinkConverterContainer getConverterContainer();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmOneToManyRelationship.java
deleted file mode 100644
index c56fee5fe2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmOneToManyRelationship.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationship;
-import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyRelationship;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyRelationship;
-
-/**
- * EclipseLink <code>orm.xml</code> 1:m relationship
- * <p>
- * 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 interface EclipseLinkOrmOneToManyRelationship
-	extends EclipseLinkOneToManyRelationship,
-			OrmOneToManyRelationship,
-			OrmJoinColumnRelationship
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmTypeMapping.java
deleted file mode 100644
index 5c54c1fcf8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmTypeMapping.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaTypeMapping;
-
-/**
- * EclipseLink type mapping
- * <p>
- * 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 interface EclipseLinkOrmTypeMapping
-	extends OrmTypeMapping, EclipseLinkTypeMapping
-{
-	// this is pretty different from the Java container (so, no common super-interface)
-	OrmEclipseLinkConverterContainer getConverterContainer();
-
-	EclipseLinkJavaTypeMapping getJavaTypeMapping();
-
-	EclipseLinkJavaTypeMapping getJavaTypeMappingForDefaults();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkCaching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkCaching.java
deleted file mode 100644
index d8acb7e6ab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkCaching.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCaching;
-
-/**
- * EclipseLink <code>orm.xml</code> caching
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface OrmEclipseLinkCaching
-	extends EclipseLinkCaching, XmlContextNode
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkConverterContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkConverterContainer.java
deleted file mode 100644
index 5cde9a486a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkConverterContainer.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkObjectTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-
-/**
- * EclipseLink <code>orm.xml</code> converter container
- * <p>
- * <strong>NB:</strong> This is only mildly-related to
- * {@link org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer};
- * thus the lack of common super-interface.
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.2
- */
-public interface OrmEclipseLinkConverterContainer
-	extends XmlContextNode
-{
-	Iterable<EclipseLinkConverter> getConverters();
-
-
-	//************ customConverters *********************
-	
-	/**
-	 * Return a list iterator of the custom converters.
-	 * This will not be null.
-	 */
-	ListIterable<? extends EclipseLinkCustomConverter> getCustomConverters();
-
-	/**
-	 * Return the number of custom converters.
-	 */
-	int getCustomConvertersSize();
-
-	/**
-	 * Add a custom converter to the converter holder, return the object representing it.
-	 */
-	EclipseLinkCustomConverter addCustomConverter(int index);
-
-	/**
-	 * Remove the custom converter at the index from the converter holder.
-	 */
-	void removeCustomConverter(int index);
-
-	/**
-	 * Remove the custom converter at from the converter holder.
-	 */
-	void removeCustomConverter(EclipseLinkCustomConverter converter);
-
-	/**
-	 * Move the custom converter from the source index to the target index.
-	 */
-	void moveCustomConverter(int targetIndex, int sourceIndex);
-
-	String CUSTOM_CONVERTERS_LIST = "customConverters"; //$NON-NLS-1$
-
-	
-	//************ object type converters *********************
-
-	/**
-	 * Return a list iterator of the object type converters.
-	 * This will not be null.
-	 */
-	ListIterable<? extends EclipseLinkObjectTypeConverter> getObjectTypeConverters();
-
-	/**
-	 * Return the number of object type converters.
-	 */
-	int getObjectTypeConvertersSize();
-
-	/**
-	 * Add a object type converter to the converter holder, return the object representing it.
-	 */
-	EclipseLinkObjectTypeConverter addObjectTypeConverter(int index);
-
-	/**
-	 * Remove the object type converter at the index from the converter holder.
-	 */
-	void removeObjectTypeConverter(int index);
-
-	/**
-	 * Remove the object type converter at from the converter holder.
-	 */
-	void removeObjectTypeConverter(EclipseLinkObjectTypeConverter converter);
-
-	/**
-	 * Move the object type converter from the source index to the target index.
-	 */
-	void moveObjectTypeConverter(int targetIndex, int sourceIndex);
-
-	String OBJECT_TYPE_CONVERTERS_LIST = "objectTypeConverters"; //$NON-NLS-1$
-	
-	
-	//************ struct converters *********************
-
-	/**
-	 * Return a list iterator of the struct converters.
-	 * This will not be null.
-	 */
-	ListIterable<? extends EclipseLinkStructConverter> getStructConverters();
-
-	/**
-	 * Return the number of struct converters.
-	 */
-	int getStructConvertersSize();
-
-	/**
-	 * Add a struct converter to the converter holder, return the object representing it.
-	 */
-	EclipseLinkStructConverter addStructConverter(int index);
-
-	/**
-	 * Remove the struct converter at the index from the converter holder.
-	 */
-	void removeStructConverter(int index);
-
-	/**
-	 * Remove the struct converter at from the converter holder.
-	 */
-	void removeStructConverter(EclipseLinkStructConverter converter);
-
-	/**
-	 * Move the struct converter from the source index to the target index.
-	 */
-	void moveStructConverter(int targetIndex, int sourceIndex);
-
-	String STRUCT_CONVERTERS_LIST = "structConverters"; //$NON-NLS-1$
-
-	
-	//************ type converters *********************
-
-	/**
-	 * Return a list iterator of the type converters.
-	 * This will not be null.
-	 */
-	ListIterable<? extends EclipseLinkTypeConverter> getTypeConverters();
-
-	/**
-	 * Return the number of type converters.
-	 */
-	int getTypeConvertersSize();
-
-	/**
-	 * Add a type converter to the converter holder, return the object representing it.
-	 */
-	EclipseLinkTypeConverter addTypeConverter(int index);
-
-	/**
-	 * Remove the type converter at the index from the converter holder.
-	 */
-	void removeTypeConverter(int index);
-
-	/**
-	 * Remove the type converter at from the converter holder.
-	 */
-	void removeTypeConverter(EclipseLinkTypeConverter converter);
-
-	/**
-	 * Move the type converter from the source index to the target index.
-	 */
-	void moveTypeConverter(int targetIndex, int sourceIndex);
-
-	String TYPE_CONVERTERS_LIST = "typeConverters"; //$NON-NLS-1$
-
-	// ********** refactoring **********
-
-	Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName);
-	Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage);
-	Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkEmbeddable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkEmbeddable.java
deleted file mode 100644
index b401ae71a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkEmbeddable.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable;
-
-/**
- * EclipseLink <code>orm.xml</code> embeddable
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface OrmEclipseLinkEmbeddable
-	extends OrmEmbeddable, EclipseLinkEmbeddable, EclipseLinkOrmTypeMapping
-{
-	XmlEmbeddable getXmlTypeMapping();
-
-	JavaEclipseLinkEmbeddable getJavaTypeMapping();
-
-	JavaEclipseLinkEmbeddable getJavaTypeMappingForDefaults();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkEntity.java
deleted file mode 100644
index 52b3b9472f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkEntity.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity;
-
-/**
- * EclipseLink <code>orm.xml</code> entity
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface OrmEclipseLinkEntity
-	extends OrmEntity, EclipseLinkEntity, OrmEclipseLinkNonEmbeddableTypeMapping
-{
-	XmlEntity getXmlTypeMapping();
-
-	JavaEclipseLinkEntity getJavaTypeMapping();
-
-	JavaEclipseLinkEntity getJavaTypeMappingForDefaults();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkMappedSuperclass.java
deleted file mode 100644
index b6886d2877..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkMappedSuperclass.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass;
-
-/**
- * EclipseLink
- * <code>orm.xml</code> mapped superclass
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface OrmEclipseLinkMappedSuperclass
-	extends OrmMappedSuperclass, EclipseLinkMappedSuperclass, OrmEclipseLinkNonEmbeddableTypeMapping
-{
-	XmlMappedSuperclass getXmlTypeMapping();
-
-	JavaEclipseLinkMappedSuperclass getJavaTypeMapping();
-
-	JavaEclipseLinkMappedSuperclass getJavaTypeMappingForDefaults();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkNonEmbeddableTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkNonEmbeddableTypeMapping.java
deleted file mode 100644
index e46aeb15e8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkNonEmbeddableTypeMapping.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
-
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkNonEmbeddableTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkNonEmbeddableTypeMapping;
-
-/**
- * EclipseLink <code>orm.xml</code> non-embeddable type mapping
- * <p>
- * 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 interface OrmEclipseLinkNonEmbeddableTypeMapping
-	extends EclipseLinkNonEmbeddableTypeMapping, EclipseLinkOrmTypeMapping
-{
-	OrmEclipseLinkCaching getCaching();
-
-	JavaEclipseLinkNonEmbeddableTypeMapping getJavaTypeMapping();
-
-	JavaEclipseLinkNonEmbeddableTypeMapping getJavaTypeMappingForDefaults();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
deleted file mode 100644
index e035c2337b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
+++ /dev/null
@@ -1,910 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.internal.utility.JDTTools;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.NonEmptyStringFilter;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode;
-import org.eclipse.jpt.jpa.core.context.MappingFile;
-import org.eclipse.jpt.jpa.core.context.MappingFileRoot;
-import org.eclipse.jpt.jpa.core.context.TypeMapping;
-import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnit;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.persistence.ImpliedMappingFileRef;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.SharedCacheMode;
-import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkEntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching.Caching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection.Connection;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Customization;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.general.GeneralProperties;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.Logging;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.options.Options;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.SchemaGeneration;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.caching.EclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.customization.EclipseLinkCustomization;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.general.EclipseLinkGeneralProperties;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.schema.generation.EclipseLinkSchemaGeneration;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * EclipseLink persistence unit
- */
-public class EclipseLinkPersistenceUnit
-	extends AbstractPersistenceUnit
-{
-	protected MappingFileRef impliedEclipseLinkMappingFileRef;
-	/**
-	 * String constant associated with changes to the implied eclipselink mapping file ref
-	 */
-	public static final String IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY = "impliedEclipseLinkMappingFileRef"; //$NON-NLS-1$
-
-
-	private/*final*/ GeneralProperties generalProperties;
-	private Customization customization;
-	private Caching caching;
-	private Logging logging;
-	private SchemaGeneration schemaGeneration;
-
-	/* global converter definitions, defined elsewhere in model */
-	protected final Vector<EclipseLinkConverter> converters = new Vector<EclipseLinkConverter>();
-
-
-	public EclipseLinkPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
-		super(parent, xmlPersistenceUnit);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void update() {
-		super.update();
-		this.setConverters(this.buildConverters());
-	}
-	
-
-	// ********** properties **********
-
-	public GeneralProperties getGeneralProperties() {
-		return this.generalProperties;
-	}
-
-	@Override
-	public Connection getConnection() {
-		return (Connection) super.getConnection();
-	}
-
-	public Customization getCustomization() {
-		return this.customization;
-	}
-
-	public Caching getCaching() {
-		return this.caching;
-	}
-
-	public String getDefaultCacheTypePropertyValue() {
-		Property cacheTypeDefaultProperty = getCacheTypeDefaultProperty();
-		return cacheTypeDefaultProperty != null ? cacheTypeDefaultProperty.getValue() : null;
-	}
-	
-	public String getDefaultCacheSizePropertyValue() {
-		Property cacheSizeDefaultProperty = getCacheSizeDefaultProperty();
-		return cacheSizeDefaultProperty != null ? cacheSizeDefaultProperty.getValue() : null;
-	}
-	
-	public String getDefaultCacheSharedPropertyValue() {
-		Property cacheSharedDefaultProperty = getCacheSharedDefaultProperty();
-		return cacheSharedDefaultProperty != null ? cacheSharedDefaultProperty.getValue() : null;
-	}
-	
-	public Logging getLogging() {
-		return this.logging;
-	}
-
-	@Override
-	public Options getOptions() {
-		return (Options) super.getOptions();
-	}
-
-	public SchemaGeneration getSchemaGeneration() {
-		return this.schemaGeneration;
-	}
-	
-	protected GeneralProperties buildEclipseLinkGeneralProperties() {
-		return new EclipseLinkGeneralProperties(this);
-	}
-
-	protected Connection buildEclipseLinkConnection() {
-		return (Connection) this.getContextNodeFactory().buildConnection(this);
-	}
-
-	protected Customization buildEclipseLinkCustomization() {
-		return new EclipseLinkCustomization(this);
-	}
-
-	protected Caching buildEclipseLinkCaching() {
-		return new EclipseLinkCaching(this);
-	}
-
-	protected Logging buildEclipseLinkLogging() {
-		return (Logging) this.getContextNodeFactory().buildLogging(this);
-	}
-
-	protected Options buildEclipseLinkOptions() {
-		return (Options) this.getContextNodeFactory().buildOptions(this);
-	}
-
-	protected SchemaGeneration buildEclipseLinkSchemaGeneration() {
-		return new EclipseLinkSchemaGeneration(this);
-	}
-
-	@Override
-	protected void initializeProperties() {
-		super.initializeProperties();
-		this.generalProperties = this.buildEclipseLinkGeneralProperties();
-		this.customization = this.buildEclipseLinkCustomization();
-		this.caching = this.buildEclipseLinkCaching();
-		this.logging = this.buildEclipseLinkLogging();
-		this.schemaGeneration = this.buildEclipseLinkSchemaGeneration();
-	}
-
-	@Override
-	public void propertyValueChanged(String propertyName, String newValue) {
-		super.propertyValueChanged(propertyName, newValue);
-		this.generalProperties.propertyValueChanged(propertyName, newValue);
-		this.customization.propertyValueChanged(propertyName, newValue);
-		this.caching.propertyValueChanged(propertyName, newValue);
-		this.logging.propertyValueChanged(propertyName, newValue);
-		this.schemaGeneration.propertyValueChanged(propertyName, newValue);
-	}
-
-	@Override
-	public void propertyRemoved(String propertyName) {
-		super.propertyRemoved(propertyName);
-		this.generalProperties.propertyRemoved(propertyName);
-		this.customization.propertyRemoved(propertyName);
-		this.caching.propertyRemoved(propertyName);
-		this.logging.propertyRemoved(propertyName);
-		this.schemaGeneration.propertyRemoved(propertyName);
-	}
-
-
-	// ********** mapping file refs **********
-
-	@Override
-	public ListIterable<MappingFileRef> getMappingFileRefs() {
-		return (this.impliedEclipseLinkMappingFileRef == null) ?
-				super.getMappingFileRefs() :
-				new CompositeListIterable<MappingFileRef>(super.getMappingFileRefs(), this.impliedEclipseLinkMappingFileRef);
-	}
-
-	@Override
-	public int getMappingFileRefsSize() {
-		return (this.impliedEclipseLinkMappingFileRef == null) ?
-				super.getMappingFileRefsSize() :
-				super.getMappingFileRefsSize() + 1;
-	}
-
-
-	// ********** implied eclipselink mapping file ref **********
-
-	public MappingFileRef getImpliedEclipseLinkMappingFileRef() {
-		return this.impliedEclipseLinkMappingFileRef;
-	}
-
-	protected MappingFileRef addImpliedEclipseLinkMappingFileRef() {
-		if (this.impliedEclipseLinkMappingFileRef != null) {
-			throw new IllegalStateException("The implied EclipseLink mapping file ref is already present: " + this.impliedEclipseLinkMappingFileRef); //$NON-NLS-1$
-		}
-		MappingFileRef mappingFileRef = this.buildEclipseLinkImpliedMappingFileRef();
-		this.impliedEclipseLinkMappingFileRef = mappingFileRef;
-		this.firePropertyChanged(IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY, null, mappingFileRef);
-		return mappingFileRef;
-	}
-
-	private ImpliedMappingFileRef buildEclipseLinkImpliedMappingFileRef() {
-		return new ImpliedMappingFileRef(this, JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH.toString());
-	}
-
-	protected void removeImpliedEclipseLinkMappingFileRef() {
-		if (this.impliedEclipseLinkMappingFileRef == null) {
-			throw new IllegalStateException("The implied EclipseLink mapping file ref is null."); //$NON-NLS-1$
-		}
-		MappingFileRef mappingFileRef = this.impliedEclipseLinkMappingFileRef;
-		this.impliedEclipseLinkMappingFileRef.dispose();
-		this.impliedEclipseLinkMappingFileRef = null;
-		this.firePropertyChanged(IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY, mappingFileRef, null);
-	}
-
-	@Override
-	protected void syncImpliedMappingFileRef() {
-		super.syncImpliedMappingFileRef();
-		if (this.impliedEclipseLinkMappingFileRef != null) {
-			this.impliedEclipseLinkMappingFileRef.synchronizeWithResourceModel();
-		}
-	}
-
-	@Override
-	protected void updateImpliedMappingFileRef() {
-		super.updateImpliedMappingFileRef();
-
-		if (this.buildsImpliedEclipseLinkMappingFile()) {
-			if (this.impliedEclipseLinkMappingFileRef == null) {
-				this.addImpliedEclipseLinkMappingFileRef();
-			} else {
-				this.impliedEclipseLinkMappingFileRef.update();
-			}
-		} else {
-			if (this.impliedEclipseLinkMappingFileRef != null) {
-				this.removeImpliedEclipseLinkMappingFileRef();
-			}
-		}
-	}
-
-	/**
-	 * Build a virtual EclipseLink mapping file if all the following are true:<ul>
-	 * <li>the properties do not explicitly exclude it
-	 * <li>it is not specified explicitly in the persistence unit
-	 * <li>the file actually exists
-	 * </ul>
-	 */
-	private boolean buildsImpliedEclipseLinkMappingFile() {
-		return this.impliedEclipseLinkMappingFileIsNotExcluded() &&
-				this.impliedEclipseLinkMappingFileIsNotSpecified() &&
-				this.impliedEclipseLinkMappingFileExists();
-	}
-
-	protected boolean impliedEclipseLinkMappingFileIsNotExcluded() {
-		return ! this.impliedEclipseLinkMappingFileIsExcluded();
-	}
-
-	protected boolean impliedEclipseLinkMappingFileIsExcluded() {
-		return this.getGeneralProperties().getExcludeEclipselinkOrm() == Boolean.TRUE;
-	}
-
-	protected boolean impliedEclipseLinkMappingFileIsNotSpecified() {
-		return ! this.impliedEclipseLinkMappingFileIsSpecified();
-	}
-
-	protected boolean impliedEclipseLinkMappingFileIsSpecified() {
-		return this.mappingFileIsSpecified(JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH.toString());
-	}
-
-	protected boolean impliedEclipseLinkMappingFileExists() {
-		return this.getJpaProject().getDefaultEclipseLinkOrmXmlResource() != null;
-	}
-
-
-	// ********** converters **********
-
-	/**
-	 * String constant associated with changes to the persistence unit's
-	 * collection of "global" converters.
-	 */
-	public static final String CONVERTERS_COLLECTION = "converters"; //$NON-NLS-1$
-
-	/**
-	 * Return the "active" converters defined within the persistence unit's scope,
-	 * including converters with duplicate names. "Active" converters are:<ul>
-	 * <li>any converter defined in mapping files
-	 * <li>any converter defined via Java annotations that is not "overridden"
-	 *     by a mapping file converter with the same name
-	 * </ul>
-	 * <strong>NB:</strong> A Java converter defined on a class or attribute
-	 * that is overridden in a mapping file is <em>not</em>, as a result,
-	 * itself overridden. A Java converter can only be overridden by a mapping
-	 * file converter with the same name.
-	 * <p>
-	 * <strong>NB:</strong> A Java converter defined on a class or attribute
-	 * whose corresponding mapping file mapping (or mapping file) is marked
-	 * "metadata complete" is ignored.
-	 */
-	// TODO bjv change to getConverterNames() etc.
-	public Iterable<EclipseLinkConverter> getAllConverters() {
-		return this.getConverters();
-	}
-
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new LiveCloneIterable<EclipseLinkConverter>(this.converters);
-	}
-
-	public int getConvertersSize() {
-		return this.converters.size();
-	}
-
-	/**
-	 * Return the names of the "active" converters defined in the persistence
-	 * unit's scope, with duplicates removed.
-	 */
-	public Iterable<String> getUniqueConverterNames() {
-		return CollectionTools.set(this.getNonEmptyConverterNames(), this.getConvertersSize());
-	}
-
-	protected Iterable<String> getNonEmptyConverterNames() {
-		return new FilteringIterable<String>(this.getConverterNames(), NonEmptyStringFilter.instance());
-	}
-
-	protected Iterable<String> getConverterNames() {
-		return new TransformationIterable<EclipseLinkConverter, String>(this.getConverters(), JpaNamedContextNode.NameTransformer.<EclipseLinkConverter>instance());
-	}
-
-	protected void setConverters(Iterable<EclipseLinkConverter> converters) {
-		this.synchronizeCollection(converters, this.converters, CONVERTERS_COLLECTION);
-	}
-
-	/**
-	 * Converters are much like queries.
-	 * @see #buildQueries()
-	 */
-	protected Iterable<EclipseLinkConverter> buildConverters() {
-		ArrayList<EclipseLinkConverter> result = CollectionTools.list(this.getMappingFileConverters());
-
-		HashSet<String> mappingFileConverterNames = this.convertToNames(result);
-		HashMap<String, ArrayList<EclipseLinkConverter>> javaConverters = this.mapByName(this.getAllJavaConverters());
-		for (Map.Entry<String, ArrayList<EclipseLinkConverter>> entry : javaConverters.entrySet()) {
-			if ( ! mappingFileConverterNames.contains(entry.getKey())) {
-				result.addAll(entry.getValue());
-			}
-		}
-
-		return result;
-	}
-
-	protected Iterable<EclipseLinkConverter> getMappingFileConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(this.getMappingFileConverterLists());
-	}
-
-	protected Iterable<Iterable<EclipseLinkConverter>> getMappingFileConverterLists() {
-		return new TransformationIterable<MappingFile, Iterable<EclipseLinkConverter>>(this.getMappingFiles()) {
-					@Override
-					protected Iterable<EclipseLinkConverter> transform(MappingFile mappingFile) {
-						MappingFileRoot root = mappingFile.getRoot();
-						return (root instanceof EclipseLinkEntityMappings) ?
-								((EclipseLinkEntityMappings) root).getMappingFileConverters() :
-								EmptyIterable.<EclipseLinkConverter>instance();
-					}
-				};
-	}
-
-	/**
-	 * Include "overridden" Java converters.
-	 */
-	protected Iterable<EclipseLinkConverter> getAllJavaConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(this.getAllJavaTypeMappingConverterLists());
-	}
-
-	protected Iterable<Iterable<EclipseLinkConverter>> getAllJavaTypeMappingConverterLists() {
-		return new TransformationIterable<TypeMapping, Iterable<EclipseLinkConverter>>(this.getAllJavaTypeMappingsUnique()) {
-					@Override
-					protected Iterable<EclipseLinkConverter> transform(TypeMapping typeMapping) {
-						return ((EclipseLinkTypeMapping) typeMapping).getConverters();
-					}
-				};
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public EclipseLinkJpaProject getJpaProject() {
-		return (EclipseLinkJpaProject) super.getJpaProject();
-	}
-
-	@Override
-	public EclipseLinkPersistenceXmlContextNodeFactory getContextNodeFactory() {
-		return (EclipseLinkPersistenceXmlContextNodeFactory) super.getContextNodeFactory();
-	}
-
-	@Override
-	public void setSpecifiedSharedCacheMode(SharedCacheMode specifiedSharedCacheMode) {
-		super.setSpecifiedSharedCacheMode(specifiedSharedCacheMode);
-		
-		if(specifiedSharedCacheMode == SharedCacheMode.NONE) {
-			this.caching.removeDefaultCachingProperties();
-		}
-	}
-	
-	@Override
-	protected SharedCacheMode buildDefaultSharedCacheMode() {
-		return SharedCacheMode.DISABLE_SELECTIVE;
-	}
-
-	@Override
-	public boolean calculateDefaultCacheable() {
-		SharedCacheMode sharedCacheMode = this.getSharedCacheMode();
-		if (sharedCacheMode == null) {
-			return true;
-		}
-		switch (sharedCacheMode) {
-			case NONE:
-			case ENABLE_SELECTIVE:
-				return false;
-			case ALL:
-			case DISABLE_SELECTIVE:
-			case UNSPECIFIED:
-				return true;
-		}
-		return true;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.validateConverters(messages, reporter);
-	}
-
-	@Override
-	protected void validateProperties(List<IMessage> messages, IReporter reporter) {
-
-		if(this.isJpa2_0Compatible()) {
-			for(Property property: this.getLegacyEntityCachingProperties()) {
-				messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-						IMessage.NORMAL_SEVERITY,
-						EclipseLinkJpaValidationMessages.PERSISTENCE_UNIT_LEGACY_ENTITY_CACHING,
-						new String[] {property.getName()},
-						this.getPersistenceUnit(),
-						property.getValidationTextRange()
-					)
-				);
-			}
-			for(Property property: this.getLegacyDescriptorCustomizerProperties()) {
-				messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-						IMessage.NORMAL_SEVERITY,
-						EclipseLinkJpaValidationMessages.PERSISTENCE_UNIT_LEGACY_DESCRIPTOR_CUSTOMIZER,
-						new String[] {property.getName()},
-						this.getPersistenceUnit(),
-						property.getValidationTextRange()
-					)
-				);
-			}
-			this.validateDefaultCachingProperty(this.getCacheTypeDefaultProperty(), messages);
-			this.validateDefaultCachingProperty(this.getCacheSizeDefaultProperty(), messages);
-			this.validateDefaultCachingProperty(this.getFlushClearCacheProperty(), messages);
-			this.validateLoggerProperty(this.getLoggerProperty(), messages);
-			this.validateExceptionHandlerProperty(this.getExceptionHandlerProperty(), messages);
-			this.validatePerformanceProfilerProperty(this.getPerformanceProfilerProperty(), messages);
-			this.validateSessionCustomizerProperty(this.getSessionCustomizerProperties(), messages);
-		}
-	}
-
-	protected void validateDefaultCachingProperty(Property cachingProperty, List<IMessage> messages) {
-		
-		if(this.getSharedCacheMode() == SharedCacheMode.NONE) {
-			if(cachingProperty != null) {
-				messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-						IMessage.NORMAL_SEVERITY,
-						EclipseLinkJpaValidationMessages.PERSISTENCE_UNIT_CACHING_PROPERTY_IGNORED,
-						new String[] {cachingProperty.getName()},
-						this.getPersistenceUnit(),
-						cachingProperty.getValidationTextRange()
-					)
-				);
-			}
-		}
-	}
-	
-	protected void validateLoggerProperty(Property loggerProperty, List<IMessage> messages) {
-		if ((loggerProperty == null) || (loggerProperty.getValue() == null) ) {
-			return;
-		}
-
-		if (ArrayTools.contains(Logging.RESERVED_LOGGER_NAMES, loggerProperty.getValue())) {
-			return;
-		}
-
-		IJavaProject javaProject = getJpaProject().getJavaProject();
-		if (StringTools.stringIsEmpty(loggerProperty.getValue())) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.SESSION_LOGGER_CLASS_NOT_SPECIFIED,
-							EMPTY_STRING_ARRAY,
-							this.getPersistenceUnit(),
-							loggerProperty.getValidationTextRange()
-					)
-			);
-		} else if (JDTTools.findType(javaProject, loggerProperty.getValue()) == null) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.SESSION_LOGGER_CLASS_NOT_EXIST,
-							new String[] {loggerProperty.getValue()},
-							this.getPersistenceUnit(),
-							loggerProperty.getValidationTextRange()
-					)
-			);
-		} else if (!JDTTools.typeIsSubType(
-				javaProject, loggerProperty.getValue(), Logging.ECLIPSELINK_LOGGER_CLASS_NAME)
-		) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.SESSION_LOGGER_CLASS_IMPLEMENTS_SESSION_LOG,
-							new String[] {loggerProperty.getValue()},
-							this.getPersistenceUnit(),
-							loggerProperty.getValidationTextRange()
-					)
-			);
-		}
-	}
-
-	private void validateExceptionHandlerProperty(Property handlerProperty, List<IMessage> messages) {
-		if ((handlerProperty == null) || (handlerProperty.getValue() == null) ) {
-			return;
-		}
-
-		IJavaProject javaProject = getJpaProject().getJavaProject();
-		if (StringTools.stringIsEmpty(handlerProperty.getValue())) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.EXCEPTION_HANDLER_CLASS_NOT_SPECIFIED,
-							EMPTY_STRING_ARRAY,
-							this.getPersistenceUnit(),
-							handlerProperty.getValidationTextRange()
-					)
-			);
-		} else if (JDTTools.findType(javaProject, handlerProperty.getValue()) == null) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.EXCEPTION_HANDLER_CLASS_NOT_EXIST,
-							new String[] {handlerProperty.getValue()},
-							this.getPersistenceUnit(),
-							handlerProperty.getValidationTextRange()
-					)
-			);
-		} else if (!JDTTools.classHasPublicZeroArgConstructor(javaProject, handlerProperty.getValue())) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.EXCEPTION_HANDLER_CLASS_NOT_VALID,
-							new String[] {handlerProperty.getValue()},
-							this.getPersistenceUnit(),
-							handlerProperty.getValidationTextRange()
-					)
-			);
-		} else if (!JDTTools.typeIsSubType(
-				javaProject, handlerProperty.getValue(), Customization.ECLIPSELINK_EXCEPTION_HANDLER_CLASS_NAME)
-		) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.EXCEPTION_HANDLER_CLASS_IMPLEMENTS_EXCEPTION_HANDLER,
-							new String[] {handlerProperty.getValue()},
-							this.getPersistenceUnit(),
-							handlerProperty.getValidationTextRange()
-					)
-			);
-		}
-	}
-
-	private void validatePerformanceProfilerProperty(Property profilerProperty, List<IMessage> messages) {
-
-		if ((profilerProperty == null) || (profilerProperty.getValue() == null) ) {
-			return;
-		}
-
-		if (ArrayTools.contains(Customization.RESERVED_PROFILER_NAMES, profilerProperty.getValue())) {
-			return;
-		}
-
-		IJavaProject javaProject = getJpaProject().getJavaProject();
-		if (StringTools.stringIsEmpty(profilerProperty.getValue())) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.SESSION_PROFILER_CLASS_NOT_SPECIFIED,
-							EMPTY_STRING_ARRAY,
-							this.getPersistenceUnit(),
-							profilerProperty.getValidationTextRange()
-					)
-			);
-		} else if (JDTTools.findType(javaProject, profilerProperty.getValue()) == null) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.SESSION_PROFILER_CLASS_NOT_EXIST,
-							new String[] {profilerProperty.getValue()},
-							this.getPersistenceUnit(),
-							profilerProperty.getValidationTextRange()
-					)
-			);
-		} else if (!JDTTools.classHasPublicZeroArgConstructor(javaProject, profilerProperty.getValue())){
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.SESSION_PROFILER_CLASS_NOT_VALID,
-							new String[] {profilerProperty.getValue()},
-							this.getPersistenceUnit(),
-							profilerProperty.getValidationTextRange()
-					)
-			);
-		} else if (!JDTTools.typeIsSubType(
-				javaProject, profilerProperty.getValue(), Customization.ECLIPSELINK_SESSION_PROFILER_CLASS_NAME)
-		) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.SESSION_PROFILER_CLASS_IMPLEMENTS_SESSIONP_ROFILER,
-							new String[] {profilerProperty.getValue()},
-							this.getPersistenceUnit(),
-							profilerProperty.getValidationTextRange()
-					)
-			);
-		}
-	}
-
-	private void validateSessionCustomizerProperty(	Iterable<Property> properties, List<IMessage> messages) {
-		for (Property property : properties) {
-			if (property.getValue() == null) {
-				return;
-			}
-
-			IJavaProject javaProject = getJpaProject().getJavaProject();
-				if (StringTools.stringIsEmpty(property.getValue())) {
-					messages.add(
-							DefaultEclipseLinkJpaValidationMessages.buildMessage(
-									IMessage.HIGH_SEVERITY,
-									EclipseLinkJpaValidationMessages.SESSION_CUSTOMIZER_CLASS_NOT_SPECIFIED,
-									EMPTY_STRING_ARRAY,
-									this.getPersistenceUnit(),
-									property.getValidationTextRange()
-							)
-					);
-				} else if (JDTTools.findType(javaProject, property.getValue()) == null) {
-					messages.add(
-							DefaultEclipseLinkJpaValidationMessages.buildMessage(
-									IMessage.HIGH_SEVERITY,
-									EclipseLinkJpaValidationMessages.SESSION_CUSTOMIZER_CLASS_NOT_EXIST,
-									new String[] {property.getValue()},
-									this.getPersistenceUnit(),
-									property.getValidationTextRange()
-							)
-					);
-				} else if (!JDTTools.classHasPublicZeroArgConstructor(javaProject, property.getValue())){
-					messages.add(
-							DefaultEclipseLinkJpaValidationMessages.buildMessage(
-									IMessage.HIGH_SEVERITY,
-									EclipseLinkJpaValidationMessages.SESSION_CUSTOMIZER_CLASS_NOT_VALID,
-									new String[] {property.getValue()},
-									this.getPersistenceUnit(),
-									property.getValidationTextRange()
-							)
-					);
-				} else if (!JDTTools.typeIsSubType(
-						javaProject, property.getValue(), Customization.ECLIPSELINK_SESSION_CUSTOMIZER_CLASS_NAME)
-				) {
-					messages.add(
-							DefaultEclipseLinkJpaValidationMessages.buildMessage(
-									IMessage.HIGH_SEVERITY,
-									EclipseLinkJpaValidationMessages.SESSION_CUSTOMIZER_CLASS_IMPLEMENTS_SESSION_CUSTOMIZER,
-									new String[] {property.getValue()},
-									this.getPersistenceUnit(),
-									property.getValidationTextRange()
-							)
-					);
-				}
-		}
-	}
-	
-
-	protected ArrayList<Property> getLegacyDescriptorCustomizerProperties() {
-		ArrayList<Property> result = new ArrayList<Property>();
-		CollectionTools.addAll(result, this.getDescriptorCustomizerProperties());
-		return result;
-	}
-
-	protected ArrayList<Property> getLegacyEntityCachingProperties() {
-		ArrayList<Property> result = new ArrayList<Property>();
-		CollectionTools.addAll(result, this.getSharedCacheProperties());
-		CollectionTools.addAll(result, this.getEntityCacheTypeProperties());
-		CollectionTools.addAll(result, this.getEntityCacheSizeProperties());
-		return result;
-	}
-
-	private Property getCacheTypeDefaultProperty() {
-		return this.getProperty(Caching.ECLIPSELINK_CACHE_TYPE_DEFAULT);
-	}
-
-	private Property getCacheSizeDefaultProperty() {
-		return this.getProperty(Caching.ECLIPSELINK_CACHE_SIZE_DEFAULT);
-	}
-	
-	private Property getCacheSharedDefaultProperty() {
-		return this.getProperty(Caching.ECLIPSELINK_CACHE_SHARED_DEFAULT);
-	}
-
-	private Property getFlushClearCacheProperty() {
-		return this.getProperty(Caching.ECLIPSELINK_FLUSH_CLEAR_CACHE);
-	}
-
-	/**
-	 * Returns all Shared Cache Properties, including Entity and default.
-	 */
-	private Iterable<Property> getSharedCacheProperties() {
-		return this.getPropertiesWithNamePrefix(Caching.ECLIPSELINK_SHARED_CACHE);
-	}
-
-	/**
-	 * Returns Entity Cache Size Properties, excluding default.
-	 */
-	private Iterable<Property> getEntityCacheSizeProperties() {
-		return this.getEntityPropertiesWithPrefix(Caching.ECLIPSELINK_CACHE_SIZE);
-	}
-	
-	/**
-	 * Returns Entity Cache Type Properties, excluding default.
-	 */
-	private Iterable<Property> getEntityCacheTypeProperties() {
-		return this.getEntityPropertiesWithPrefix(Caching.ECLIPSELINK_CACHE_TYPE);
-	}
-	
-	/**
-	 * Returns Descriptor Customizer Properties.
-	 */
-	private Iterable<Property> getDescriptorCustomizerProperties() {
-		return this.getEntityPropertiesWithPrefix(Customization.ECLIPSELINK_DESCRIPTOR_CUSTOMIZER);
-	}
-	
-	/**
-	 * Returns Entity Properties with the given prefix,
-	 * excluding Entity which name equals "default".
-	 */
-	private Iterable<Property> getEntityPropertiesWithPrefix(String prefix) {
-	   return new FilteringIterable<Property>(this.getPropertiesWithNamePrefix(prefix)) {
-	      @Override
-	      protected boolean accept(Property next) {
-				return ! next.getName().endsWith("default"); //$NON-NLS-1$
-	      }
-	   };
-	}
-
-	private Property getLoggerProperty() {
-		return this.getProperty(Logging.ECLIPSELINK_LOGGER);
-	}
-	
-	private Property getExceptionHandlerProperty() {
-		return this.getProperty(Customization.ECLIPSELINK_EXCEPTION_HANDLER);
-	}
-
-	private Property getPerformanceProfilerProperty() {
-		return this.getProperty(Customization.ECLIPSELINK_PROFILER);
-	}
-
-	/**
-	 * Returns all Session Customizer Properties.
-	 */
-	private Iterable<Property> getSessionCustomizerProperties() {
-		return this.getPropertiesWithNamePrefix(Customization.ECLIPSELINK_SESSION_CUSTOMIZER);
-	}
-
-	/**
-	 * <strong>NB:</strong> We validate converters here.
-	 * @see #validateGenerators(List, IReporter)
-	 */
-	protected void validateConverters(List<IMessage> messages, IReporter reporter) {
-		this.checkForDuplicateConverters(messages);
-		for (EclipseLinkConverter converter : this.getConverters()) {
-			this.validate(converter, messages, reporter);
-		}
-	}
-
-	protected void checkForDuplicateConverters(List<IMessage> messages) {
-		HashMap<String, ArrayList<EclipseLinkConverter>> convertersByName = this.mapByName(this.getConverters());
-		for (Map.Entry<String, ArrayList<EclipseLinkConverter>> entry : convertersByName.entrySet()) {
-			String converterName = entry.getKey();
-			if (StringTools.stringIsNotEmpty(converterName)) {  // ignore empty names
-				ArrayList<EclipseLinkConverter> dups = entry.getValue();
-				if (dups.size() > 1) {
-					String[] parms = new String[] {converterName};
-					for (EclipseLinkConverter dup : dups) {
-						messages.add(
-							DefaultEclipseLinkJpaValidationMessages.buildMessage(
-								IMessage.HIGH_SEVERITY,
-								EclipseLinkJpaValidationMessages.CONVERTER_DUPLICATE_NAME,
-								parms,
-								dup,
-								this.extractNameTextRange(dup)
-							)
-						);
-					}
-				}
-			}
-		}
-	}
-
-	// TODO bjv isn't it obvious?
-	protected TextRange extractNameTextRange(EclipseLinkConverter converter) {
-		return (converter instanceof OrmEclipseLinkConverter<?>) ?
-				((OrmEclipseLinkConverter<?>) converter).getNameTextRange() :
-				((JavaEclipseLinkConverter<?>) converter).getNameTextRange(null);
-	}
-
-	// TODO bjv isn't it obvious?
-	protected void validate(EclipseLinkConverter converter, List<IMessage> messages, IReporter reporter) {
-		if (converter instanceof OrmEclipseLinkConverter<?>) {
-			((OrmEclipseLinkConverter<?>) converter).validate(messages, reporter);
-		} else {
-			((JavaEclipseLinkConverter<?>) converter).validate(messages, reporter, null);
-		}
-	}
-
-
-	// ********** refactoring **********
-
-	@Override
-	@SuppressWarnings("unchecked")
-	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createPersistenceUnitPropertiesRenameTypeEdits(originalType, newName),
-				this.customization.createRenameTypeEdits(originalType, newName),
-				this.logging.createRenameTypeEdits(originalType, newName)
-			);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createPersistenceUnitPropertiesMoveTypeEdits(originalType, newPackage),
-				this.customization.createMoveTypeEdits(originalType, newPackage),
-				this.logging.createMoveTypeEdits(originalType, newPackage)
-			);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	protected Iterable<ReplaceEdit> createPersistenceUnitPropertiesRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createPersistenceUnitPropertiesRenamePackageEdits(originalPackage, newName),
-				this.customization.createRenamePackageEdits(originalPackage, newName),
-				this.logging.createRenamePackageEdits(originalPackage, newName)
-			);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
deleted file mode 100644
index 8a21402ae9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
-
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlContextNodeFactory;
-
-public interface EclipseLinkPersistenceXmlContextNodeFactory extends PersistenceXmlContextNodeFactory
-{	
-
-	PersistenceUnitProperties buildLogging(PersistenceUnit parent);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/CacheType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/CacheType.java
deleted file mode 100644
index 00db3e3424..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/CacheType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching;
-
-/**
- *  CacheType
- */
-public enum CacheType {
-	soft_weak, 
-	hard_weak, 
-	weak,
-	soft,
-	full,
-	none; 
-
-	// EclipseLink value string
-	public static final String FULL = "Full";
-	public static final String HARD_WEAK = "HardWeak";
-	public static final String NONE = "NONE";
-	public static final String SOFT = "Soft";
-	public static final String SOFT_WEAK = "SoftWeak";
-	public static final String WEAK = "Weak";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Caching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Caching.java
deleted file mode 100644
index 7aa948dce4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Caching.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
-
-/**
- *  Caching
- */
-public interface Caching extends PersistenceUnitProperties
-{
-	CacheType getDefaultCacheTypeDefault();
-	CacheType getCacheTypeDefault();
-	void setCacheTypeDefault(CacheType cacheTypeDefault);
-		static final String CACHE_TYPE_DEFAULT_PROPERTY = "cacheTypeDefault"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_TYPE_DEFAULT = "eclipselink.cache.type.default"; //$NON-NLS-1$
-		static final CacheType DEFAULT_CACHE_TYPE_DEFAULT = CacheType.soft_weak;
-
-	Integer getDefaultCacheSizeDefault();
-	Integer getCacheSizeDefault();
-	void setCacheSizeDefault(Integer cacheSizeDefault);
-		static final String CACHE_SIZE_DEFAULT_PROPERTY = "cacheSizeDefault"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_SIZE_DEFAULT = "eclipselink.cache.size.default"; //$NON-NLS-1$
-		static final Integer DEFAULT_CACHE_SIZE_DEFAULT = Integer.valueOf(100);
-
-	Boolean getDefaultSharedCacheDefault();
-	Boolean getSharedCacheDefault();
-	void setSharedCacheDefault(Boolean sharedCacheDefault);
-		static final String SHARED_CACHE_DEFAULT_PROPERTY = "sharedCacheDefault"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_SHARED_DEFAULT = "eclipselink.cache.shared.default"; //$NON-NLS-1$
-		static final Boolean DEFAULT_SHARED_CACHE_DEFAULT = Boolean.TRUE;
-
-
-	CacheType getDefaultCacheType();
-	CacheType getCacheTypeOf(String entityName);
-	void setCacheTypeOf(String entityName, CacheType cacheType);
-		static final String CACHE_TYPE_PROPERTY = "cacheType"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_TYPE = "eclipselink.cache.type."; //$NON-NLS-1$
-		static final CacheType DEFAULT_CACHE_TYPE = CacheType.soft_weak;
-
-	Integer getDefaultCacheSize();
-	Integer getCacheSizeOf(String entityName);
-	void setCacheSizeOf(String entityName, Integer cacheSize);
-		static final String CACHE_SIZE_PROPERTY = "cacheSize"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_SIZE = "eclipselink.cache.size."; //$NON-NLS-1$
-		static final Integer DEFAULT_CACHE_SIZE = Integer.valueOf(100);
-
-	Boolean getDefaultSharedCache();
-	Boolean getSharedCacheOf(String entityName);
-	void setSharedCacheOf(String entityName, Boolean sharedCache);
-		static final String SHARED_CACHE_PROPERTY = "sharedCache"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_SHARED_CACHE = "eclipselink.cache.shared."; //$NON-NLS-1$
-		static final Boolean DEFAULT_SHARED_CACHE = Boolean.TRUE;
-
-	FlushClearCache getDefaultFlushClearCache();
-	FlushClearCache getFlushClearCache();
-	void setFlushClearCache(FlushClearCache newFlushClearCache);
-		static final String FLUSH_CLEAR_CACHE_PROPERTY = "flushClearCache"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_FLUSH_CLEAR_CACHE = "eclipselink.flush-clear.cache"; //$NON-NLS-1$
-		static final FlushClearCache DEFAULT_FLUSH_CLEAR_CACHE = FlushClearCache.drop_invalidate;
-
-	void removeDefaultCachingProperties();
-
-	ListIterable<Entity> getEntities();
-	Iterable<String> getEntityNames();
-	int getEntitiesSize();
-	boolean entityExists(String entity);
-	Entity addEntity(String entity);
-	void removeEntity(String entity);
-		String ENTITIES_LIST = "entities"; //$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Entity.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Entity.java
deleted file mode 100644
index 438c99d63e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/Entity.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching;
-
-import java.io.Serializable;
-
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-
-/**
- *  Entity
- */
-public class Entity extends AbstractModel implements Cloneable, Serializable
-{
-	private String name;
-	private Caching parent;
-
-	public static final String CACHE_TYPE_PROPERTY = Caching.CACHE_TYPE_PROPERTY;
-	public static final String CACHE_SIZE_PROPERTY = Caching.CACHE_SIZE_PROPERTY;
-	public static final String SHARED_CACHE_PROPERTY = Caching.SHARED_CACHE_PROPERTY;
-
-	// ********** EclipseLink properties **********
-	private CacheType cacheType;
-	private Integer cacheSize;
-	private Boolean cacheIsShared;
-
-	private static final long serialVersionUID = 1L;
-
-	// ********** constructors **********
-	public Entity(Caching parent, String name) {
-		this(parent);
-		this.initialize(name);
-	}
-	
-	private Entity(Caching parent) {
-		this.parent = parent;
-	}
-	
-	private void initialize(String name) {
-		if(StringTools.stringIsEmpty(name)) {
-			throw new IllegalArgumentException();
-		}
-		this.name = name;
-	}
-
-	// ********** behaviors **********
-	@Override
-	public boolean equals(Object o) {
-		if ( ! (o instanceof Entity)) {
-			return false;
-		}
-		Entity other = (Entity) o;
-		return (
-			(this.cacheType == null ?
-				other.cacheType == null : this.cacheType.equals(other.cacheType)) &&
-			(this.cacheIsShared == null ?
-				other.cacheIsShared == null : this.cacheIsShared.equals(other.cacheIsShared)) &&
-			(this.cacheSize == null ?
-				other.cacheSize == null : this.cacheSize.equals(other.cacheSize)));
-	}
-
-	@Override
-	public int hashCode() {
-		return (this.cacheType == null) ? 0 : this.cacheType.hashCode();
-	}
-	
-	 @Override
-	 public Entity clone() {
-		 try {
-			 return (Entity)super.clone();
-		 }
-		 catch (CloneNotSupportedException ex) {
-			 throw new InternalError();
-		 }
-	 }
-
-	public boolean isEmpty() {
-		return (this.cacheType == null) &&
-					(this.cacheSize == null) &&
-					(this.cacheIsShared == null);
-	}
-	
-	public boolean entityNameIsValid() {
-		return ! StringTools.stringIsEmpty(this.name);
-	}
-
-	public Caching getParent() {
-		return this.parent;
-	}
-	
-	// ********** name **********
-	public String getName() {
-		return this.name;
-	}
-
-	// ********** cacheType **********
-	public CacheType getCacheType() {
-		return this.cacheType;
-	}
-
-	public void setCacheType(CacheType cacheType) {
-		CacheType old = this.cacheType;
-		this.cacheType = cacheType;
-		this.firePropertyChanged(CACHE_TYPE_PROPERTY, old, cacheType);
-	}
-
-	// ********** cacheSize **********
-	public Integer getCacheSize() {
-		return this.cacheSize;
-	}
-
-	public void setCacheSize(Integer cacheSize) {
-		Integer old = this.cacheSize;
-		this.cacheSize = cacheSize;
-		this.firePropertyChanged(CACHE_SIZE_PROPERTY, old, cacheSize);
-	}
-
-	// ********** cacheIsShared **********
-	public Boolean cacheIsShared() {
-		return this.cacheIsShared;
-	}
-
-	public void setSharedCache(Boolean isShared) {
-		Boolean old = this.cacheIsShared;
-		this.cacheIsShared = isShared;
-		this.firePropertyChanged(SHARED_CACHE_PROPERTY, old, isShared);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append("name: "); //$NON-NLS-1$
-		sb.append(this.name);
-		sb.append(", cacheType: "); //$NON-NLS-1$
-		sb.append(this.cacheType);
-		sb.append(", cacheSize: "); //$NON-NLS-1$
-		sb.append(this.cacheSize);
-		sb.append(", cacheIsShared: "); //$NON-NLS-1$
-		sb.append(this.cacheIsShared);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/FlushClearCache.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/FlushClearCache.java
deleted file mode 100644
index 20fa560499..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/caching/FlushClearCache.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching;
-
-/**
- *  FlushClearCache
- */
-public enum FlushClearCache {
-	drop,
-	drop_invalidate,
-	merge; 
-
-	// EclipseLink value string
-	public static final String DROP = "Drop";
-	public static final String DROP_INVALIDATE = "DropInvalidate";
-	public static final String MERGE = "Merge";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/BatchWriting.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/BatchWriting.java
deleted file mode 100644
index 6b34b7b3a6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/BatchWriting.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection;
-
-/**
- *  BatchWriting
- */
-public enum BatchWriting {
-			none, 
-			jdbc, 
-			buffered, 
-			oracle_jdbc;
-
-	// EclipseLink value string
-	static final String NONE = "None";
-	static final String JDBC = "JDBC";
-	static final String BUFFERED = "Buffered";
-	static final String ORACLE_JDBC = "Oracle-JDBC";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/Connection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/Connection.java
deleted file mode 100644
index cec1a5f510..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/Connection.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection;
-
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
-
-/**
- *  Connection
- */
-public interface Connection extends PersistenceUnitProperties
-{
-	Boolean getDefaultNativeSql();
-	Boolean getNativeSql();
-	void setNativeSql(Boolean newNativeSql);
-		static final String NATIVE_SQL_PROPERTY = "nativeSql"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_NATIVE_SQL = "eclipselink.jdbc.native-sql"; //$NON-NLS-1$
-		static final Boolean DEFAULT_NATIVE_SQL = Boolean.FALSE;
-
-	BatchWriting getDefaultBatchWriting();
-	BatchWriting getBatchWriting();
-	void setBatchWriting(BatchWriting newBatchWriting);
-		static final String BATCH_WRITING_PROPERTY = "batchWriting"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_BATCH_WRITING = "eclipselink.jdbc.batch-writing"; //$NON-NLS-1$
-		static final BatchWriting DEFAULT_BATCH_WRITING = BatchWriting.none;
-
-	Boolean getDefaultCacheStatements();
-	Boolean getCacheStatements();
-	void setCacheStatements(Boolean newCacheStatements);
-		static final String CACHE_STATEMENTS_PROPERTY = "cacheStatements"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_STATEMENTS = "eclipselink.jdbc.cache-statements"; //$NON-NLS-1$
-		static final Boolean DEFAULT_CACHE_STATEMENTS = Boolean.FALSE;
-
-	Integer getDefaultCacheStatementsSize();
-	Integer getCacheStatementsSize();
-	void setCacheStatementsSize(Integer newCacheStatementsSize);
-		static final String CACHE_STATEMENTS_SIZE_PROPERTY = "cacheStatementsSize"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_STATEMENTS_SIZE = "eclipselink.jdbc.cache-statements.size"; //$NON-NLS-1$
-		static final Integer DEFAULT_CACHE_STATEMENTS_SIZE = Integer.valueOf(50);
-
-	String getDefaultDriver();
-	String getDriver();
-	void setDriver(String newDriver);
-		static final String DRIVER_PROPERTY = "driver"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_DRIVER = "eclipselink.jdbc.driver"; //$NON-NLS-1$
-		static final String DEFAULT_DRIVER = ""; //$NON-NLS-1$
-
-	String getDefaultUrl();
-	String getUrl();
-	void setUrl(String newUrl);
-		static final String URL_PROPERTY = "url"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_URL = "eclipselink.jdbc.url"; //$NON-NLS-1$
-		static final String DEFAULT_URL = ""; //$NON-NLS-1$
-
-	String getDefaultUser();
-	String getUser();
-	void setUser(String newUser);
-		static final String USER_PROPERTY = "user"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_USER = "eclipselink.jdbc.user"; //$NON-NLS-1$
-		static final String DEFAULT_USER = ""; //$NON-NLS-1$
-
-	String getDefaultPassword();
-	String getPassword();
-	void setPassword(String newPassword);
-		static final String PASSWORD_PROPERTY = "password"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_PASSWORD = "eclipselink.jdbc.password"; //$NON-NLS-1$
-		static final String DEFAULT_PASSWORD = ""; //$NON-NLS-1$
-
-	Boolean getDefaultBindParameters();
-	Boolean getBindParameters();
-	void setBindParameters(Boolean newBindParameters);
-		static final String BIND_PARAMETERS_PROPERTY = "bindParameters"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_BIND_PARAMETERS = "eclipselink.jdbc.bind-parameters"; //$NON-NLS-1$
-		static final Boolean DEFAULT_BIND_PARAMETERS = Boolean.TRUE;
-
-	Boolean getDefaultReadConnectionsShared();
-	Boolean getReadConnectionsShared();
-	void setReadConnectionsShared(Boolean newReadConnectionsShared);
-		static final String READ_CONNECTIONS_SHARED_PROPERTY = "readConnectionsShared"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_READ_CONNECTIONS_SHARED = "eclipselink.jdbc.read-connections.shared"; //$NON-NLS-1$
-		static final Boolean DEFAULT_READ_CONNECTIONS_SHARED = Boolean.FALSE;
-
-	Integer getDefaultReadConnectionsMin();
-	Integer getReadConnectionsMin();
-	void setReadConnectionsMin(Integer newReadConnectionsMin);
-		static final String READ_CONNECTIONS_MIN_PROPERTY = "readConnectionsMin"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_READ_CONNECTIONS_MIN = "eclipselink.jdbc.read-connections.min"; //$NON-NLS-1$
-		static final Integer DEFAULT_READ_CONNECTIONS_MIN = Integer.valueOf(2);
-
-	Integer getDefaultReadConnectionsMax();
-	Integer getReadConnectionsMax();
-	void setReadConnectionsMax(Integer newReadConnectionsMax);
-		static final String READ_CONNECTIONS_MAX_PROPERTY = "readConnectionsMax"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_READ_CONNECTIONS_MAX = "eclipselink.jdbc.read-connections.max"; //$NON-NLS-1$
-		static final Integer DEFAULT_READ_CONNECTIONS_MAX = Integer.valueOf(2);
-
-	Integer getDefaultWriteConnectionsMin();
-	Integer getWriteConnectionsMin();
-	void setWriteConnectionsMin(Integer newWriteConnectionsMin);
-		static final String WRITE_CONNECTIONS_MIN_PROPERTY = "writeConnectionsMin"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_WRITE_CONNECTIONS_MIN = "eclipselink.jdbc.write-connections.min"; //$NON-NLS-1$
-		static final Integer DEFAULT_WRITE_CONNECTIONS_MIN = Integer.valueOf(5);
-
-	Integer getDefaultWriteConnectionsMax();
-	Integer getWriteConnectionsMax();
-	void setWriteConnectionsMax(Integer newWriteConnectionsMax);
-		static final String WRITE_CONNECTIONS_MAX_PROPERTY = "writeConnectionsMax"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_WRITE_CONNECTIONS_MAX = "eclipselink.jdbc.write-connections.max"; //$NON-NLS-1$
-		static final Integer DEFAULT_WRITE_CONNECTIONS_MAX = Integer.valueOf(10);
-
-	ExclusiveConnectionMode getDefaultExclusiveConnectionMode();
-	ExclusiveConnectionMode getExclusiveConnectionMode();
-	void setExclusiveConnectionMode(ExclusiveConnectionMode newExclusiveConnectionMode);
-		static final String EXCLUSIVE_CONNECTION_MODE_PROPERTY = "exclusiveConnectionMode"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_EXCLUSIVE_CONNECTION_MODE = "eclipselink.jdbc.exclusive-connection.mode"; //$NON-NLS-1$
-		static final ExclusiveConnectionMode DEFAULT_EXCLUSIVE_CONNECTION_MODE = ExclusiveConnectionMode.transactional;
-
-	Boolean getDefaultLazyConnection();
-	Boolean getLazyConnection();
-	void setLazyConnection(Boolean newLazyConnection);
-		static final String LAZY_CONNECTION_PROPERTY = "lazyConnection"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_LAZY_CONNECTION = "eclipselink.jdbc.exclusive-connection.is-lazy"; //$NON-NLS-1$
-		static final Boolean DEFAULT_LAZY_CONNECTION = Boolean.TRUE;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/ExclusiveConnectionMode.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/ExclusiveConnectionMode.java
deleted file mode 100644
index 9dd93bfd86..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/connection/ExclusiveConnectionMode.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection;
-
-/**
- *  ExclusiveConnectionMode
- */
-public enum ExclusiveConnectionMode {
-	always,
-	isolated,
-	transactional;
-
-	// EclipseLink value string
-	static final String ALWAYS = "Always";
-	static final String ISOLATED = "Isolated";
-	static final String TRANSACTIONAL = "Transactional";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Customization.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Customization.java
deleted file mode 100644
index 4c11af9478..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Customization.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties;
-
-/**
- *  Customization
- */
-public interface Customization extends PersistenceUnitProperties
-{
-	Boolean getDefaultThrowExceptions();
-	Boolean getThrowExceptions();
-	void setThrowExceptions(Boolean newThrowExceptions);
-		static final String THROW_EXCEPTIONS_PROPERTY = "throwExceptions"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_THROW_EXCEPTIONS = "eclipselink.orm.throw.exceptions"; //$NON-NLS-1$
-		static final Boolean DEFAULT_THROW_EXCEPTIONS = Boolean.TRUE;
-	
-	Weaving getDefaultWeaving();
-	Weaving getWeaving();
-	void setWeaving(Weaving newWeaving);
-		static final String WEAVING_PROPERTY = "weaving"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING = "eclipselink.weaving"; //$NON-NLS-1$
-		static final Weaving DEFAULT_WEAVING = Weaving.true_;
- 
-	Boolean getDefaultWeavingLazy();
-	Boolean getWeavingLazy();
-	void setWeavingLazy(Boolean newWeavingLazy);
-		static final String WEAVING_LAZY_PROPERTY = "weavingLazy"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_LAZY = "eclipselink.weaving.lazy"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_LAZY = Boolean.TRUE;
-	
-	Boolean getDefaultWeavingChangeTracking();
-	Boolean getWeavingChangeTracking();
-	void setWeavingChangeTracking(Boolean newWeavingChangeTracking);
-		static final String WEAVING_CHANGE_TRACKING_PROPERTY = "weavingChangeTracking"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_CHANGE_TRACKING = "eclipselink.weaving.changetracking"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_CHANGE_TRACKING = Boolean.TRUE;
-
-	Boolean getDefaultWeavingFetchGroups();
-	Boolean getWeavingFetchGroups();
-	void setWeavingFetchGroups(Boolean newWeavingFetchGroups);
-		static final String WEAVING_FETCH_GROUPS_PROPERTY = "weavingFetchGroups"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_FETCH_GROUPS = "eclipselink.weaving.fetchgroups"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_FETCH_GROUPS = Boolean.TRUE;
-
-	Boolean getDefaultWeavingInternal();
-	Boolean getWeavingInternal();
-	void setWeavingInternal(Boolean newWeavingInternal);
-		static final String WEAVING_INTERNAL_PROPERTY = "weavingInternal"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_INTERNAL = "eclipselink.weaving.internal"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_INTERNAL = Boolean.TRUE;
-
-	Boolean getDefaultWeavingEager();
-	Boolean getWeavingEager();
-	void setWeavingEager(Boolean newWeavingEager);
-		static final String WEAVING_EAGER_PROPERTY = "weavingEager"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_EAGER = "eclipselink.weaving.eager"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_EAGER = Boolean.FALSE;
-
-	String getDefaultDescriptorCustomizer();
-	String getDescriptorCustomizerOf(String entityName);
-	void setDescriptorCustomizerOf(String entityName, String newDescriptorCustomizer);
-		static final String DESCRIPTOR_CUSTOMIZER_PROPERTY = "descriptorCustomizer"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_DESCRIPTOR_CUSTOMIZER = "eclipselink.descriptor.customizer."; //$NON-NLS-1$
-		static final String DEFAULT_DESCRIPTOR_CUSTOMIZER = null;	// no default
-
-	ListIterable<String> getSessionCustomizers();
-	int getSessionCustomizersSize();
-	boolean sessionCustomizerExists(String sessionCustomizerClassName);
-	String addSessionCustomizer(String newSessionCustomizerClassName);
-	void removeSessionCustomizer(String sessionCustomizerClassName);
-		static final String SESSION_CUSTOMIZER_LIST = "sessionCustomizers"; //$NON-NLS-1$
-		static final String SESSION_CUSTOMIZER_PROPERTY = "sessionCustomizer"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_SESSION_CUSTOMIZER = "eclipselink.session.customizer"; //$NON-NLS-1$
-		String ECLIPSELINK_SESSION_CUSTOMIZER_CLASS_NAME = "org.eclipse.persistence.config.SessionCustomizer"; //$NON-NLS-1$
-
-	ListIterable<Entity> getEntities();
-	Iterable<String> getEntityNames();
-	int getEntitiesSize();
-	boolean entityExists(String entity);
-	Entity addEntity(String entity);
-	void removeEntity(String entity);
-		static final String ENTITIES_LIST = "entities"; //$NON-NLS-1$
-		
-	String getDefaultProfiler();
-	String getProfiler();
-	void setProfiler(String newProfiler);
-	void setProfiler(Profiler newProfiler);
-		static final String PROFILER_PROPERTY = "profiler"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_PROFILER = "eclipselink.profiler"; //$NON-NLS-1$
-		static final String DEFAULT_PROFILER = 
-			AbstractPersistenceUnitProperties.getPropertyStringValueOf(Profiler.no_profiler);
-		static final String[] RESERVED_PROFILER_NAMES = {Profiler.NO_PROFILER, Profiler.PERFORMANCE_PROFILER, Profiler.QUERY_MONITOR};
-		String ECLIPSELINK_SESSION_PROFILER_CLASS_NAME = "org.eclipse.persistence.sessions.SessionProfiler"; //$NON-NLS-1$
-		
-	Boolean getDefaultValidationOnly();
-	Boolean getValidationOnly();
-	void setValidationOnly(Boolean newValidationOnly);
-		static final String VALIDATION_ONLY_PROPERTY = "validationOnly"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_VALIDATION_ONLY = "eclipselink.validation-only"; //$NON-NLS-1$
-		static final Boolean DEFAULT_VALIDATION_ONLY = Boolean.TRUE;
-
-	String getDefaultExceptionHandler();
-	String getExceptionHandler();
-	void setExceptionHandler(String newExceptionHandler);
-		static final String EXCEPTION_HANDLER_PROPERTY = "exceptionHandler"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_EXCEPTION_HANDLER = "eclipselink.exception-handler"; //$NON-NLS-1$
-		static final String DEFAULT_EXCEPTION_HANDLER = null;	// no default
-		String ECLIPSELINK_EXCEPTION_HANDLER_CLASS_NAME = "org.eclipse.persistence.exceptions.ExceptionHandler"; //$NON-NLS-1$
-
-	Boolean getDefaultValidateSchema();
-	Boolean getValidateSchema();
-	void setValidateSchema(Boolean newValidateSchema);
-		static final String VALIDATE_SCHEMA_PROPERTY = "validateSchema"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_VALIDATE_SCHEMA = "eclipselink.orm.validate.schema"; //$NON-NLS-1$
-		static final Boolean DEFAULT_VALIDATE_SCHEMA = Boolean.FALSE;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Entity.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Entity.java
deleted file mode 100644
index c97426bcdb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Entity.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization;
-
-import java.io.Serializable;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-
-/**
- *  Entity
- */
-public class Entity extends AbstractModel implements Cloneable, Serializable
-{
-	private String name;
-	private Customization parent;
-
-	public static final String DESCRIPTOR_CUSTOMIZER_PROPERTY = Customization.DESCRIPTOR_CUSTOMIZER_PROPERTY;
-
-	// ********** EclipseLink properties **********
-	private String descriptorCustomizer;
-
-	private static final long serialVersionUID = 1L;
-
-	// ********** constructors **********
-	public Entity(Customization parent, String name) {
-		this(parent);
-		this.initialize(name);
-	}
-
-	private Entity(Customization parent) {
-		this.parent = parent;
-	}
-	
-	private void initialize(String name) {
-		if(StringTools.stringIsEmpty(name)) {
-			throw new IllegalArgumentException();
-		}
-		this.name = name;
-	}
-
-	// ********** behaviors **********
-	@Override
-	public boolean equals(Object o) {
-		if ( ! (o instanceof Entity)) {
-			return false;
-		}
-		Entity customizer = (Entity) o;
-		return (
-			(this.descriptorCustomizer == null ?
-				customizer.descriptorCustomizer == null : 
-				this.descriptorCustomizer.equals(customizer.descriptorCustomizer)));
-	}
-	
-	@Override
-	public int hashCode() {
-		return (this.descriptorCustomizer == null) ? 0 : this.descriptorCustomizer.hashCode();
-	}
-	
-	 @Override
-	 public Entity clone() {
-		 try {
-			 return (Entity)super.clone();
-		 }
-		 catch (CloneNotSupportedException ex) {
-			 throw new InternalError();
-		 }
-	 }
-
-	public boolean isEmpty() {
-		return this.descriptorCustomizer == null;
-	}
-	
-	public boolean entityNameIsValid() {
-		return ! StringTools.stringIsEmpty(this.name);
-	}
-
-	public Customization getParent() {
-		return this.parent;
-	}
-
-	// ********** getter/setter **********
-	public String getName() {
-		return this.name;
-	}
-
-	public String getDescriptorCustomizer() {
-		return this.descriptorCustomizer;
-	}
-
-	public void setDescriptorCustomizer(String descriptorCustomizer) {
-		String old = this.descriptorCustomizer;
-		this.descriptorCustomizer = descriptorCustomizer;
-		this.firePropertyChanged(DESCRIPTOR_CUSTOMIZER_PROPERTY, old, descriptorCustomizer);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append("name: "); //$NON-NLS-1$
-		sb.append(this.name);
-		sb.append(", descriptorCustomizer: "); //$NON-NLS-1$
-		sb.append(this.descriptorCustomizer);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Profiler.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Profiler.java
deleted file mode 100644
index e5b30d6881..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Profiler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization;
-
-/**
- *  Profiler
- */
-public enum Profiler {
-	performance_profiler, 
-	query_monitor,
-	no_profiler;
-
-	// EclipseLink value string
-	public static final String PERFORMANCE_PROFILER = "PerformanceProfiler"; //$NON-NLS-1$
-	public static final String QUERY_MONITOR = "QueryMonitor"; //$NON-NLS-1$
-	public static final String NO_PROFILER = "NoProfiler"; //$NON-NLS-1$
-
-	// EclipseLink profiler class names
-	public static final String PERFORMANCE_PROFILER_CLASS_NAME = "org.eclipse.persistence.tools.profiler.PerformanceProfiler"; //$NON-NLS-1$
-	public static final String QUERY_MONITOR_CLASS_NAME = "org.eclipse.persistence.tools.profiler.QueryMonitor"; //$NON-NLS-1$
-
-	/**
-	 * Return the Profiler value corresponding to the given literal.
-	 */
-	public static Profiler getProfilerFor(String literal) {
-		
-		for( Profiler profiler : Profiler.values()) {
-			if(profiler.toString().equals(literal)) {
-				return profiler;
-			}
-		}
-		return null;
-	}
-	
-	
-	public static String getProfilerClassName(String profilerValue) {
-		if (profilerValue == PERFORMANCE_PROFILER) {
-			return PERFORMANCE_PROFILER_CLASS_NAME;
-		}
-		if (profilerValue == QUERY_MONITOR) {
-			return QUERY_MONITOR_CLASS_NAME;
-		}
-		return profilerValue;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Weaving.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Weaving.java
deleted file mode 100644
index d17d62b3f2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/customization/Weaving.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization;
-
-/**
- *  Weaving
- */
-public enum Weaving {
-	true_,
-	false_, 
-	static_;
-
-	// EclipseLink value string
-	public static final String TRUE_ = "true";
-	public static final String FALSE_ = "false";
-	public static final String STATIC_ = "static";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/general/GeneralProperties.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/general/GeneralProperties.java
deleted file mode 100644
index 22cdbcd1d5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/general/GeneralProperties.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.general;
-
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
-
-/**
- *  GeneralProperties
- */
-public interface GeneralProperties extends PersistenceUnitProperties
-{
-
-	Boolean getDefaultExcludeEclipselinkOrm();
-	Boolean getExcludeEclipselinkOrm();
-	void setExcludeEclipselinkOrm(Boolean newExcludeEclipselinkOrm);
-		static final String EXCLUDE_ECLIPSELINK_ORM_PROPERTY = "excludeEclipselinkOrm"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM = "eclipselink.exclude-eclipselink-orm"; //$NON-NLS-1$
-		static final Boolean DEFAULT_EXCLUDE_ECLIPSELINK_ORM = Boolean.FALSE;
-		
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/Logger.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/Logger.java
deleted file mode 100644
index f59a739b15..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/Logger.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging;
-
-/**
- * Logger
- */
-public enum Logger {
-			default_logger, 
-			java_logger, 
-			server_logger;
-	
-	// EclipseLink value string
-	public static final String DEFAULT_LOGGER = "DefaultLogger"; //$NON-NLS-1$
-	public static final String JAVA_LOGGER = "JavaLogger"; //$NON-NLS-1$
-	public static final String SERVER_LOGGER = "ServerLogger"; //$NON-NLS-1$
-	
-	// EclipseLink logger class names
-	public static final String DEFAULT_LOGGER_CLASS_NAME = "org.eclipse.persistence.logging.DefaultSessionLog"; //$NON-NLS-1$
-	public static final String JAVA_LOGGER_CLASS_NAME = "org.eclipse.persistence.logging.JavaLog"; //$NON-NLS-1$
-	public static final String SERVER_LOGGER_CLASS_NAME = "org.eclipse.persistence.platform.server.ServerLog"; //$NON-NLS-1$
-	
-	/**
-	 * Return the Logger value corresponding to the given literal.
-	 */
-	public static Logger getLoggerFor(String literal) {
-		
-		for( Logger logger : Logger.values()) {
-			if(logger.toString().equals(literal)) {
-				return logger;
-			}
-		}
-		return null;
-	}
-	
-	public static String getLoggerClassName(String loggerValue) {
-		if (loggerValue == DEFAULT_LOGGER) {
-			return DEFAULT_LOGGER_CLASS_NAME;
-		}
-		if (loggerValue == JAVA_LOGGER) {
-			return JAVA_LOGGER_CLASS_NAME;
-		}
-		if (loggerValue == SERVER_LOGGER) {
-			return SERVER_LOGGER_CLASS_NAME;
-		}
-		return loggerValue;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/Logging.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/Logging.java
deleted file mode 100644
index a74c3cd581..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/Logging.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging;
-
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties;
-
-/**
- * Logging
- */
-public interface Logging extends PersistenceUnitProperties
-{
-	LoggingLevel getDefaultLevel();
-	LoggingLevel getLevel();
-	void setLevel(LoggingLevel level);
-		static final String LEVEL_PROPERTY = "level"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_LEVEL = "eclipselink.logging.level"; //$NON-NLS-1$
-		static final LoggingLevel DEFAULT_LEVEL = LoggingLevel.info;
-	
-	Boolean getDefaultTimestamp();
-	Boolean getTimestamp();
-	void setTimestamp(Boolean timestamp);
-		static final String TIMESTAMP_PROPERTY = "timestamp"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_TIMESTAMP = "eclipselink.logging.timestamp"; //$NON-NLS-1$
-		static final Boolean DEFAULT_TIMESTAMP = Boolean.TRUE;
-	
-	Boolean getDefaultThread();
-	Boolean getThread();
-	void setThread(Boolean thread);
-		static final String THREAD_PROPERTY = "thread"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_THREAD = "eclipselink.logging.thread"; //$NON-NLS-1$
-		static final Boolean DEFAULT_THREAD = Boolean.TRUE;
-	
-	Boolean getDefaultSession();
-	Boolean getSession();
-	void setSession(Boolean session);
-		static final String SESSION_PROPERTY = "session"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_SESSION = "eclipselink.logging.session"; //$NON-NLS-1$
-		static final Boolean DEFAULT_SESSION = Boolean.TRUE;
-	
-	Boolean getDefaultExceptions();
-	Boolean getExceptions();
-	void setExceptions(Boolean exceptions);
-		static final String EXCEPTIONS_PROPERTY = "exceptions"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_EXCEPTIONS = "eclipselink.logging.exceptions"; //$NON-NLS-1$
-		static final Boolean DEFAULT_EXCEPTIONS = Boolean.FALSE;
-		
-	String getDefaultLogFileLocation();
-	String getLogFileLocation();
-	void setLogFileLocation(String newLogFileLocation);
-		static final String LOG_FILE_LOCATION_PROPERTY = "logFileLocation"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_LOG_FILE_LOCATION = "eclipselink.logging.file"; //$NON-NLS-1$
-		static final String DEFAULT_LOG_FILE_LOCATION = null;		// No Default
-		
-	String getDefaultLogger();
-	String getLogger();
-	void setLogger(String newLogger);
-	void setLogger(Logger newLogger);
-		static final String LOGGER_PROPERTY = "logger"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_LOGGER = "eclipselink.logging.logger"; //$NON-NLS-1$
-		static final String DEFAULT_LOGGER = 
-			AbstractPersistenceUnitProperties.getPropertyStringValueOf(Logger.default_logger);
-		static final String[] RESERVED_LOGGER_NAMES = {Logger.DEFAULT_LOGGER, Logger.JAVA_LOGGER, Logger.SERVER_LOGGER};
-		String ECLIPSELINK_LOGGER_CLASS_NAME = "org.eclipse.persistence.logging.SessionLog"; //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/LoggingLevel.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/LoggingLevel.java
deleted file mode 100644
index 05d90a9739..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/logging/LoggingLevel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging;
-
-/**
- *  LoggingLevel
- */
-public enum LoggingLevel {
-			off, 
-			severe, 
-			warning, 
-			info, 
-			config, 
-			fine, 
-			finer,
-			finest,
-			all;
-
-	// EclipseLink value string
-	public static final String OFF = "OFF";
-	public static final String SEVERE = "SEVERE";
-	public static final String WARNING = "WARNING";
-	public static final String INFO = "INFO";
-	public static final String CONFIG = "CONFIG";
-	public static final String FINE = "FINE";
-	public static final String FINER = "FINER";
-	public static final String FINEST = "FINEST";
-	public static final String ALL = "ALL";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/Options.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/Options.java
deleted file mode 100644
index 1176f7b381..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/Options.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.options;
-
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties;
-
-/**
- *  Session Options
- */
-public interface Options extends PersistenceUnitProperties
-{
-	String getDefaultSessionName();
-	String getSessionName();
-	void setSessionName(String newSessionName); 
-		static final String SESSION_NAME_PROPERTY = "sessionName"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_SESSION_NAME = "eclipselink.session-name"; //$NON-NLS-1$
-		static final String DEFAULT_SESSION_NAME = "";	// no default //$NON-NLS-1$
-
-	String getDefaultSessionsXml();
-	String getSessionsXml();
-	void setSessionsXml(String newSessionsXml);
-		static final String SESSIONS_XML_PROPERTY = "sessionsXml"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_SESSIONS_XML = "eclipselink.sessions-xml"; //$NON-NLS-1$
-		static final String DEFAULT_SESSIONS_XML = "";	// no default //$NON-NLS-1$
-		
-	Boolean getDefaultIncludeDescriptorQueries();
-	Boolean getIncludeDescriptorQueries();
-	void setIncludeDescriptorQueries(Boolean newIncludeDescriptorQueries);
-		static final String SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY = "includeDescriptorQueriesy"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_SESSION_INCLUDE_DESCRIPTOR_QUERIES = "eclipselink.session.include.descriptor.queries"; //$NON-NLS-1$
-		static final Boolean DEFAULT_SESSION_INCLUDE_DESCRIPTOR_QUERIES = Boolean.TRUE;
-		
-	String getDefaultTargetDatabase();
-	String getTargetDatabase();
-	void setTargetDatabase(String newTargetDatabase);
-	void setTargetDatabase(TargetDatabase newTargetDatabase);
-		static final String TARGET_DATABASE_PROPERTY = "targetDatabase"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_TARGET_DATABASE = "eclipselink.target-database"; //$NON-NLS-1$
-		static final String DEFAULT_TARGET_DATABASE = 
-			AbstractPersistenceUnitProperties.getPropertyStringValueOf(TargetDatabase.auto);
-
-	String getDefaultTargetServer();
-	String getTargetServer();
-	void setTargetServer(String newTargetServer);
-	void setTargetServer(TargetServer newTargetServer);
-		static final String TARGET_SERVER_PROPERTY = "targetServer"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_TARGET_SERVER = "eclipselink.target-server"; //$NON-NLS-1$
-		static final String DEFAULT_TARGET_SERVER = 
-			AbstractPersistenceUnitProperties.getPropertyStringValueOf(TargetServer.none);
-
-	String getDefaultEventListener();
-	String getEventListener();
-	void setEventListener(String newEventListener);
-		static final String SESSION_EVENT_LISTENER_PROPERTY = "eventListener"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_SESSION_EVENT_LISTENER = "eclipselink.session-event-listener"; //$NON-NLS-1$
-		static final String DEFAULT_SESSION_EVENT_LISTENER = null;	// no default
-		String ECLIPSELINK_EVENT_LISTENER_CLASS_NAME = "org.eclipse.persistence.sessions.SessionEventListener"; //$NON-NLS-1$
-
-	Boolean getDefaultTemporalMutable();
-	Boolean getTemporalMutable();
-	void setTemporalMutable(Boolean temporalMutable);
-		static final String TEMPORAL_MUTABLE_PROPERTY = "temporalMutable"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_TEMPORAL_MUTABLE = "eclipselink.temporal.mutable"; //$NON-NLS-1$
-		static final Boolean DEFAULT_TEMPORAL_MUTABLE = Boolean.FALSE;
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/TargetDatabase.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/TargetDatabase.java
deleted file mode 100644
index 34b4178d1f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/TargetDatabase.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.options;
-
-/**
- *  TargetDatabase
- */
-public enum TargetDatabase {
-			attunity,
-			auto,
-			cloudscape,
-			database,
-			db2,
-			db2mainframe,
-			dbase,
-			derby,
-			hsql,
-			informix,
-			javadb,
-			mysql,
-			oracle,
-			oracle11,
-			oracle10,
-			oracle9,
-			oracle8,
-			pointbase,
-			postgresql,
-			sqlanywhere,
-			sqlserver,
-			sybase,
-			timesten;
-
-	// EclipseLink value string
-	static final String ATTUNITY = "Attunity";
-    static final String AUTO = "Auto";
-    static final String CLOUDSCAPE = "Cloudscape";
-    static final String DATABASE = "Database";
-    static final String DB2 = "DB2";
-    static final String DB2MAINFRAME = "DB2Mainframe";
-    static final String DBASE = "DBase";
-    static final String DERBY = "Derby";
-    static final String HSQL = "HSQL";
-    static final String INFORMIX = "Informix";
-    static final String JAVADB = "JavaDB";
-    static final String MYSQL = "MySQL";
-    static final String ORACLE = "Oracle";
-    static final String ORACLE11 = "Oracle11";
-    static final String ORACLE10 = "Oracle10g";
-    static final String ORACLE9 = "Oracle9i";
-    static final String ORACLE8 = "Oracle8i";
-    static final String POINTBASE = "PointBase";
-    static final String POSTGRESQL = "PostgreSQL";
-    static final String SQLANYWHERE = "SQLAnywhere";
-    static final String SQLSERVER = "SQLServer";
-    static final String SYBASE = "Sybase";
-    static final String TIMESTEN = "TimesTen";
-
-	/**
-	 * Return the TargetDatabase value corresponding to the given literal.
-	 */
-	public static TargetDatabase getTargetDatabaseFor(String literal) {
-		
-		for( TargetDatabase targetDatabase : TargetDatabase.values()) {
-			if(targetDatabase.toString().equals(literal)) {
-				return targetDatabase;
-			}
-		}
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/TargetServer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/TargetServer.java
deleted file mode 100644
index e1948cd6b7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/options/TargetServer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.options;
-
-/**
- *  TargetServer
- */
-public enum TargetServer {
-			none,
-			oc4j,
-			sunas9,
-			websphere,
-			websphere_6_1,
-			weblogic,
-			weblogic_9,
-			weblogic_10,
-			jboss;
-
-	// EclipseLink value string
-	static final String NONE = "None";
-	static final String OC4J = "OC4J";
-	static final String SUNAS9 = "SunAS9";
-	static final String WEBSPHERE = "WebSphere";
-	static final String WEBSPHERE_6_1 = "WebSphere_6_1";
-	static final String WEBLOGIC = "WebLogic";
-	static final String WEBLOGIC_9 = "WebLogic_9";
-	static final String WEBLOGIC_10 = "WebLogic_10";
-	static final String JBOSS = "JBoss";
-
-	/**
-	 * Return the TargetServer value corresponding to the given literal.
-	 */
-	public static TargetServer getTargetServerFor(String literal) {
-		
-		for( TargetServer targetServer : TargetServer.values()) {
-			if(targetServer.toString().equals(literal)) {
-				return targetServer;
-			}
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/DdlGenerationType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/DdlGenerationType.java
deleted file mode 100644
index 398138569e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/DdlGenerationType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation;
-
-/**
- *  DdlGenerationType
- */
-public enum DdlGenerationType {
-	none, 
-	create_tables, 
-	drop_and_create_tables;
-	
-	// EclipseLink value string
-	public static final String NONE = "none";
-	public static final String CREATE_TABLES = "create-tables";
-	public static final String DROP_AND_CREATE_TABLES = "drop-and-create-tables";
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/OutputMode.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/OutputMode.java
deleted file mode 100644
index 216d2003f1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/OutputMode.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation;
-
-/**
- *  OutputMode
- */
-public enum OutputMode {
-	both, 
-	sql_script, 
-	database;
-
-	// EclipseLink value string
-	public static final String BOTH = "both";
-	public static final String DATABASE = "database";
-	public static final String SQL_SCRIPT = "sql-script";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/SchemaGeneration.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/SchemaGeneration.java
deleted file mode 100644
index 4678657581..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/schema/generation/SchemaGeneration.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation;
-
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
-
-/**
- *  SchemaGeneration
- */
-public interface SchemaGeneration extends PersistenceUnitProperties
-{
-	DdlGenerationType getDefaultDdlGenerationType();
-	DdlGenerationType getDdlGenerationType();
-	void setDdlGenerationType(DdlGenerationType ddlGenerationType);
-		static final String DDL_GENERATION_TYPE_PROPERTY = "ddlGenerationType"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_DDL_GENERATION_TYPE = "eclipselink.ddl-generation"; //$NON-NLS-1$
-		static final DdlGenerationType DEFAULT_SCHEMA_GENERATION_DDL_GENERATION_TYPE = DdlGenerationType.none;
-
-	OutputMode getDefaultOutputMode();
-	OutputMode getOutputMode();
-	void setOutputMode(OutputMode outputMode); // put
-		static final String OUTPUT_MODE_PROPERTY = "outputMode"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_DDL_GENERATION_OUTPUT_MODE = "eclipselink.ddl-generation.output-mode"; //$NON-NLS-1$
-		static final OutputMode DEFAULT_SCHEMA_GENERATION_OUTPUT_MODE = null;		// No Default
-
-	String getDefaultCreateFileName();
-	String getCreateFileName();
-	void setCreateFileName(String createFileName);
-		static final String CREATE_FILE_NAME_PROPERTY = "createFileName"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CREATE_FILE_NAME = "eclipselink.create-ddl-jdbc-file-name"; //$NON-NLS-1$
-		static final String DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME = "createDDL.sql"; //$NON-NLS-1$
-	
-	String getDefaultDropFileName();
-	String getDropFileName();
-	void setDropFileName(String dropFileName);
-		static final String DROP_FILE_NAME_PROPERTY = "dropFileName"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_DROP_FILE_NAME = "eclipselink.drop-ddl-jdbc-file-name"; //$NON-NLS-1$
-		static final String DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME = "dropDDL.sql"; //$NON-NLS-1$
-		
-	String getDefaultApplicationLocation();
-	String getApplicationLocation();
-	void setApplicationLocation(String applicationLocation);
-		static final String APPLICATION_LOCATION_PROPERTY = "applicationLocation"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_APPLICATION_LOCATION = "eclipselink.application-location"; //$NON-NLS-1$
-		static final String DEFAULT_SCHEMA_GENERATION_APPLICATION_LOCATION = null; //$NON-NLS-1$
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/DefaultEclipseLinkJpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/DefaultEclipseLinkJpaValidationMessages.java
deleted file mode 100644
index 2403108791..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/DefaultEclipseLinkJpaValidationMessages.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal;
-
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class DefaultEclipseLinkJpaValidationMessages {
-
-	private static String[] DEFAULT_PARMS = new String[0];
-	private static TextRange DEFAULT_TEXT_RANGE = TextRange.Empty.instance();
-	
-	public static IMessage buildMessage(
-			int severity, String messageId, Object targetObject) {
-		return buildMessage(severity, messageId, DEFAULT_PARMS, targetObject);
-	}
-	
-	public static IMessage buildMessage(
-			int severity, String messageId, String[] parms, Object targetObject) {
-		return buildMessage(severity, messageId, parms, targetObject, DEFAULT_TEXT_RANGE);
-	}
-	
-	public static IMessage buildMessage(
-			int severity, String messageId, Object targetObject, TextRange textRange) {
-		return buildMessage(severity, messageId, DEFAULT_PARMS, targetObject, textRange);
-	}
-	
-	public static IMessage buildMessage(
-			int severity, String messageId, String[] parms, Object targetObject, TextRange textRange) {
-		IMessage message = new EclipseLinkMessage(EclipseLinkJpaValidationMessages.BUNDLE_NAME, severity, messageId, parms, targetObject);
-		message.setMarkerId(JptJpaCorePlugin.VALIDATION_MARKER_ID); //TODO do we need an 'EclipseLink JPA' problem marker?
-		if (textRange == null) {
-			//log an exception and then continue without setting location information
-			//At least the user will still get the validation message and will
-			//be able to see other validation messages with valid textRanges
-			JptJpaCorePlugin.log(new IllegalArgumentException("Null text range for message ID: " + messageId)); //$NON-NLS-1$
-		}
-		else {
-			message.setLineNo(textRange.getLineNumber());
-			message.setOffset(textRange.getOffset());
-			message.setLength(textRange.getLength());
-		}
-		return message;
-	}
-	
-	
-	private DefaultEclipseLinkJpaValidationMessages() {
-		super();
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Used so that we can find the resource bundle using this classLoader.
-	 * Otherwise the wst validation message attempts to use the ClassLoader
-	 * of JpaValidator which is in the org.eclipse.jpt.jpa.core plugin.
-	 * 
-	 * Another way we could potentially solve this is to have a separate
-	 * EclispeLinkJpaValidator and set up the extension points so that
-	 * it only runs against jpaProjects with the EclispeLinkPlatform
-	 * while JpaValidator runs against jpaProjects with the GenericPlatform.
-	 * I am unsure if this is possible
-	 */
-	private static class EclipseLinkMessage extends Message {
-		public EclipseLinkMessage(String aBundleName, int aSeverity, String anId, String[] aParams, Object aTargetObject) {
-			super(aBundleName, aSeverity, anId, aParams, aTargetObject);
-		}
-		
-		@Override
-		public ResourceBundle getBundle(Locale locale, ClassLoader classLoader) {
-			ResourceBundle bundle = null;
-			try {
-				bundle = ResourceBundle.getBundle(getBundleName(), locale, getClass().getClassLoader());
-			} catch (MissingResourceException e) {
-				return super.getBundle(locale, classLoader);
-			}
-			return bundle;
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java
deleted file mode 100644
index 1b0bb221d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaAnnotationDefinitionProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal;
-
-import java.util.ArrayList;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicCollectionAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicMapAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCacheAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkChangeTrackingAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConvertAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCustomizerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkExistenceCheckingAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkJoinFetchAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMutableAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrimaryKeyAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrivateOwnedAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadOnlyAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadTransformerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTransformationAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkVariableOneToOneAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkWriteTransformerAnnotationDefinition;
-
-/**
- * Provides annotations for 1.0 EclipseLink platform
- */
-public class EclipseLinkJpaAnnotationDefinitionProvider
-	extends AbstractJpaAnnotationDefinitionProvider
-{
-	// singleton
-	private static final JpaAnnotationDefinitionProvider INSTANCE = new EclipseLinkJpaAnnotationDefinitionProvider();
-
-	/**
-	 * Return the singleton
-	 */
-	public static JpaAnnotationDefinitionProvider instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJpaAnnotationDefinitionProvider() {
-		super();
-	}
-
-	@Override
-	protected void addAnnotationDefinitionsTo(ArrayList<AnnotationDefinition> definitions) {
-		CollectionTools.addAll(definitions, ANNOTATION_DEFINITIONS);
-	}
-
-	protected static final AnnotationDefinition[] ANNOTATION_DEFINITIONS = new AnnotationDefinition[] {
-		EclipseLinkBasicCollectionAnnotationDefinition.instance(),
-		EclipseLinkBasicMapAnnotationDefinition.instance(),
-		EclipseLinkCacheAnnotationDefinition.instance(),
-		EclipseLinkChangeTrackingAnnotationDefinition.instance(),
-		EclipseLinkConvertAnnotationDefinition.instance(),
-		EclipseLinkConverterAnnotationDefinition.instance(),
-		EclipseLinkCustomizerAnnotationDefinition.instance(),
-		EclipseLinkExistenceCheckingAnnotationDefinition.instance(),
-		EclipseLinkJoinFetchAnnotationDefinition.instance(),
-		EclipseLinkMutableAnnotationDefinition.instance(),
-		EclipseLinkObjectTypeConverterAnnotationDefinition.instance(),
-		EclipseLinkPrimaryKeyAnnotationDefinition.instance(),
-		EclipseLinkPrivateOwnedAnnotationDefinition.instance(),
-		EclipseLinkReadOnlyAnnotationDefinition.instance(),
-		EclipseLinkReadTransformerAnnotationDefinition.instance(),
-		EclipseLinkStructConverterAnnotationDefinition.instance(),
-		EclipseLinkTransformationAnnotationDefinition.instance(),
-		EclipseLinkTypeConverterAnnotationDefinition.instance(),
-		EclipseLinkVariableOneToOneAnnotationDefinition.instance(),
-		EclipseLinkWriteTransformerAnnotationDefinition.instance()
-	};
-
-	@Override
-	protected void addNestableAnnotationDefinitionsTo(ArrayList<NestableAnnotationDefinition> definitions) {
-		// nothing new for EclipseLink
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaFactory.java
deleted file mode 100644
index 739a8dd196..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaFactory.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal;
-
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.java.Accessor;
-import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaFactory;
-import org.eclipse.jpt.jpa.core.resource.java.EmbeddableAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.MappedSuperclassAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkBasicCollectionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkBasicMapMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkBasicMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkEmbeddableImpl;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkEntityImpl;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkIdMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkManyToManyMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkManyToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkMappedSuperclassImpl;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkOneToManyMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkOneToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkTransformationMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkVariableOneToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkVersionMapping;
-
-public class EclipseLinkJpaFactory
-	extends AbstractJpaFactory
-{
-	public EclipseLinkJpaFactory() {
-		super();
-	}
-
-
-	// ********** Core Model **********
-	
-	@Override
-	public EclipseLinkJpaProject buildJpaProject(JpaProject.Config config) {
-		return new EclipseLinkJpaProjectImpl(config);
-	}
-	
-
-	// ********** Java Context Model overrides **********
-
-	@Override
-	public JavaPersistentAttribute buildJavaPersistentAttribute(PersistentType parent, Accessor accessor) {
-		return new JavaEclipseLinkPersistentAttribute(parent, accessor);
-	}
-
-	@Override
-	public JavaPersistentAttribute buildJavaPersistentField(PersistentType parent, JavaResourceField resourceField) {
-		return new JavaEclipseLinkPersistentAttribute(parent, resourceField);
-	}
-
-	@Override
-	public JavaPersistentAttribute buildJavaPersistentProperty(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) {
-		return new JavaEclipseLinkPersistentAttribute(parent, resourceGetter, resourceSetter);
-	}
-
-	@Override
-	public JavaBasicMapping buildJavaBasicMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkBasicMapping(parent);
-	}
-	
-	@Override
-	public JavaEmbeddable buildJavaEmbeddable(JavaPersistentType parent, EmbeddableAnnotation embeddableAnnotation) {
-		return new JavaEclipseLinkEmbeddableImpl(parent, embeddableAnnotation);
-	}
-	
-	@Override
-	public JavaEclipseLinkEntity buildJavaEntity(JavaPersistentType parent, EntityAnnotation entityAnnotation) {
-		return new JavaEclipseLinkEntityImpl(parent, entityAnnotation);
-	}
-	
-	@Override
-	public JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkIdMapping(parent);
-	}
-	
-	@Override
-	public JavaEclipseLinkMappedSuperclass buildJavaMappedSuperclass(JavaPersistentType parent, MappedSuperclassAnnotation mappedSuperclassAnnotation) {
-		return new JavaEclipseLinkMappedSuperclassImpl(parent, mappedSuperclassAnnotation);
-	}
-	
-	@Override
-	public JavaVersionMapping buildJavaVersionMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkVersionMapping(parent);
-	}
-	
-	@Override
-	public JavaOneToManyMapping buildJavaOneToManyMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkOneToManyMapping(parent);
-	}
-	
-	@Override
-	public JavaOneToOneMapping buildJavaOneToOneMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkOneToOneMapping(parent);
-	}
-	
-	@Override
-	public JavaManyToManyMapping buildJavaManyToManyMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkManyToManyMapping(parent);
-	}
-	
-	@Override
-	public JavaManyToOneMapping buildJavaManyToOneMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkManyToOneMapping(parent);
-	}
-
-
-	// ********** EclipseLink-specific Java Context Model **********
-
-	public JavaEclipseLinkBasicCollectionMapping buildJavaEclipseLinkBasicCollectionMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkBasicCollectionMapping(parent);
-	}
-	
-	public JavaEclipseLinkBasicMapMapping buildJavaEclipseLinkBasicMapMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkBasicMapMapping(parent);
-	}
-	
-	public JavaEclipseLinkTransformationMapping buildJavaEclipseLinkTransformationMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkTransformationMapping(parent);
-	}
-
-	public JavaEclipseLinkVariableOneToOneMapping buildJavaEclipseLinkVariableOneToOneMapping(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkVariableOneToOneMapping(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java
deleted file mode 100644
index 18c80ec350..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal;
-
-import org.eclipse.jpt.common.core.AnnotationProvider;
-import org.eclipse.jpt.jpa.core.JpaFacet;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
-import org.eclipse.jpt.jpa.core.JpaPlatformFactory;
-import org.eclipse.jpt.jpa.core.JpaPlatformVariation;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatformFactory.SimpleVersion;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-
-/**
- * All the state in the JPA platform should be "static" (i.e. unchanging once
- * it is initialized).
- */
-public class EclipseLinkJpaPlatformFactory
-	implements JpaPlatformFactory
-{
-
-	/**
-	 * zero-argument constructor
-	 */
-	public EclipseLinkJpaPlatformFactory() {
-		super();
-	}
-	
-	public JpaPlatform buildJpaPlatform(String id) {
-		return new GenericJpaPlatform(
-			id,
-			buildJpaVersion(),
-			new EclipseLinkJpaFactory(), 
-			buildAnnotationProvider(), 
-			EclipseLinkJpaPlatformProvider.instance(), 
-			buildJpaPlatformVariation());
-	}
-	
-	private JpaPlatform.Version buildJpaVersion() {
-		return new EclipseLinkVersion(
-				JptJpaEclipseLinkCorePlugin.ECLIPSELINK_PLATFORM_VERSION_1_0,
-				JpaFacet.VERSION_1_0.getVersionString());
-	}
-	
-	protected AnnotationProvider buildAnnotationProvider() {
-		return new JpaAnnotationProvider(
-			GenericJpaAnnotationDefinitionProvider.instance(),
-			EclipseLinkJpaAnnotationDefinitionProvider.instance());
-	}
-	
-	protected JpaPlatformVariation buildJpaPlatformVariation() {
-		return new JpaPlatformVariation() {
-			public Supported getTablePerConcreteClassInheritanceIsSupported() {
-				return Supported.NO;
-			}
-			public boolean isJoinTableOverridable() {
-				return false;
-			}
-		};
-	}
-
-
-	public static class EclipseLinkVersion extends SimpleVersion {
-		protected final String eclipseLinkVersion;
-
-		public EclipseLinkVersion(String eclipseLinkVersion, String jpaVersion) {
-			super(jpaVersion);
-			this.eclipseLinkVersion = eclipseLinkVersion;
-		}
-
-		@Override
-		public String getVersion() {
-			return this.eclipseLinkVersion;
-		}
-
-		@Override
-		public String toString() {
-			return super.toString() + " EclipseLink version: " + this.getVersion(); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaPlatformProvider.java
deleted file mode 100644
index 641e5b14a1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaPlatformProvider.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal;
-
-import java.util.ArrayList;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptCommonCorePlugin;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.JpaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.ResourceDefinition;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.internal.JarResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicCollectionMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMapMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEmbeddableDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEntityDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaIdMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaManyToManyMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaManyToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaMappedSuperclassDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaTransformationMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaVariableOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaVersionMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceXmlDefinition;
-
-/**
- * EclipseLink platform
- */
-public class EclipseLinkJpaPlatformProvider
-		extends AbstractJpaPlatformProvider {
-	
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLinkJpaPlatformProvider();
-
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJpaPlatformProvider() {
-		super();
-	}
-
-
-	// ********* resource models *********
-
-	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
-		if (contentType.equals(JptCommonCorePlugin.JAVA_SOURCE_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAVA_SOURCE_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptCommonCorePlugin.JAR_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAR_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaCorePlugin.PERSISTENCE_XML_CONTENT_TYPE)) {
-			return JptJpaCorePlugin.PERSISTENCE_XML_1_0_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaCorePlugin.ORM_XML_CONTENT_TYPE)) {
-			return JptJpaCorePlugin.ORM_XML_1_0_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_1_0_RESOURCE_TYPE;
-		}
-		else {
-			throw new IllegalArgumentException(contentType.toString());
-		}
-	}
-
-	@Override
-	protected void addResourceModelProvidersTo(ArrayList<JpaResourceModelProvider> providers) {
-		CollectionTools.addAll(providers, RESOURCE_MODEL_PROVIDERS);
-	}
-
-	// order should not be important here
-	protected static final JpaResourceModelProvider[] RESOURCE_MODEL_PROVIDERS = new JpaResourceModelProvider[] {
-		JavaResourceModelProvider.instance(),
-		JarResourceModelProvider.instance(),
-		PersistenceResourceModelProvider.instance(),
-		OrmResourceModelProvider.instance(),
-		EclipseLinkOrmResourceModelProvider.instance()
-	};
-
-
-	// ********* Java type mappings *********
-
-	@Override
-	protected void addJavaTypeMappingDefinitionsTo(ArrayList<JavaTypeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, JAVA_TYPE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no EclipseLink-specific mappings
-	protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] {
-		EclipseLinkJavaEntityDefinition.instance(),
-		EclipseLinkJavaEmbeddableDefinition.instance(),
-		EclipseLinkJavaMappedSuperclassDefinition.instance()
-	};
-
-
-	// ********* Java attribute mappings *********
-
-	@Override
-	protected void addDefaultJavaAttributeMappingDefinitionsTo(ArrayList<DefaultJavaAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] {
-		JavaEmbeddedMappingDefinition.instance(),
-		EclipseLinkJavaOneToManyMappingDefinition.instance(),
-		EclipseLinkJavaOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaVariableOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaBasicMappingDefinition.instance()
-	};
-
-	@Override
-	protected void addSpecifiedJavaAttributeMappingDefinitionsTo(ArrayList<JavaAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	protected static final JavaAttributeMappingDefinition[] SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new JavaAttributeMappingDefinition[] {
-		JavaTransientMappingDefinition.instance(),
-		EclipseLinkJavaBasicCollectionMappingDefinition.instance(),
-		EclipseLinkJavaBasicMapMappingDefinition.instance(),
-		EclipseLinkJavaIdMappingDefinition.instance(),
-		EclipseLinkJavaVersionMappingDefinition.instance(),
-		EclipseLinkJavaBasicMappingDefinition.instance(),
-		JavaEmbeddedMappingDefinition.instance(),
-		JavaEmbeddedIdMappingDefinition.instance(),
-		EclipseLinkJavaTransformationMappingDefinition.instance(),
-		EclipseLinkJavaManyToManyMappingDefinition.instance(),
-		EclipseLinkJavaManyToOneMappingDefinition.instance(),
-		EclipseLinkJavaOneToManyMappingDefinition.instance(),
-		EclipseLinkJavaOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaVariableOneToOneMappingDefinition.instance()
-	};
-
-
-	// ********** resource definitions **********
-
-	@Override
-	protected void addResourceDefinitionsTo(ArrayList<ResourceDefinition> definitions) {
-		CollectionTools.addAll(definitions, RESOURCE_DEFINITIONS);
-	}
-
-	protected static final ResourceDefinition[] RESOURCE_DEFINITIONS = new ResourceDefinition[] {
-		EclipseLinkPersistenceXmlDefinition.instance(),
-		EclipseLinkOrmXmlDefinition.instance(),
-		GenericOrmXmlDefinition.instance()
-	};
-}
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
deleted file mode 100644
index d354457ad5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaProjectImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal;
-
-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.JptJpaEclipseLinkCorePlugin;
-
-/**
- * EclipseLink-specific JPA project.
- */
-public class EclipseLinkJpaProjectImpl
-		extends AbstractJpaProject
-		implements EclipseLinkJpaProject {
-	
-	public EclipseLinkJpaProjectImpl(JpaProject.Config config) {
-		super(config);
-	}
-	
-	public JpaXmlResource getDefaultEclipseLinkOrmXmlResource() {
-		return (JpaXmlResource) this.getResourceModel(
-				JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH,
-				JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaValidationMessages.java
deleted file mode 100644
index 772a11b2d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaValidationMessages.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal;
-
-@SuppressWarnings("nls")
-public interface EclipseLinkJpaValidationMessages {
-
-	public static final String BUNDLE_NAME = "eclipselink_jpa_validation";
-
-	public static final String CACHE_EXPIRY_AND_EXPIRY_TIME_OF_DAY_BOTH_SPECIFIED = "CACHE_EXPIRY_AND_EXPIRY_TIME_OF_DAY_BOTH_SPECIFIED";
-
-	public static final String CONVERTER_CLASS_IMPLEMENTS_CONVERTER = "CONVERTER_CLASS_IMPLEMENTS_CONVERTER";
-	
-	public static final String STRUCT_CONVERTER_CLASS_IMPLEMENTS_STRUCT_CONVERTER = "STRUCT_CONVERTER_CLASS_IMPLEMENTS_STRUCT_CONVERTER";
-	
-	public static final String CONVERTER_DUPLICATE_NAME = "CONVERTER_DUPLICATE_NAME";
-	
-	public static final String CONVERTER_NAME_UNDEFINED = "CONVERTER_NAME_UNDEFINED";
-	
-	public static final String RESERVED_CONVERTER_NAME = "RESERVED_CONVERTER_NAME";
-
-	public static final String CONVERTER_CLASS_EXISTS = "CONVERTER_CLASS_EXISTS";
-	
-	public static final String CONVERTER_CLASS_DEFINED = "CONVERTER_CLASS_DEFINED";
-
-	public static final String DESCRIPTOR_CUSTOMIZER_CLASS_NOT_SPECIFIED = "DESCRIPTOR_CUSTOMIZER_CLASS_NOT_SPECIFIED";
-
-	public static final String DESCRIPTOR_CUSTOMIZER_CLASS_NOT_EXIST = "DESCRIPTOR_CUSTOMIZER_CLASS_NOT_EXIST";
-
-	public static final String DESCRIPTOR_CUSTOMIZER_CLASS_NOT_VALID = "DESCRIPTOR_CUSTOMIZER_CLASS_NOT_VALID";
-
-	public static final String DESCRIPTOR_CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER = "DESCRIPTOR_CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER";
-	
-	public static final String EXCEPTION_HANDLER_CLASS_NOT_SPECIFIED = "EXCEPTION_HANDLER_CLASS_NOT_SPECIFIED";
-	
-	public static final String EXCEPTION_HANDLER_CLASS_NOT_EXIST = "EXCEPTION_HANDLER_CLASS_NOT_EXIST";
-	
-	public static final String EXCEPTION_HANDLER_CLASS_NOT_VALID = "EXCEPTION_HANDLER_CLASS_NOT_VALID";
-	
-	public static final String EXCEPTION_HANDLER_CLASS_IMPLEMENTS_EXCEPTION_HANDLER = "EXCEPTION_HANDLER_CLASS_IMPLEMENTS_EXCEPTION_HANDLER";
-	
-	public static final String ID_MAPPING_UNRESOLVED_CONVERTER_NAME = "ID_MAPPING_UNRESOLVED_CONVERTER_NAME";
-
-	public static final String MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE = "MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE";
-	
-	public static final String PERSISTENT_ATTRIBUTE_INVALID_VERSION_MAPPING_TYPE = "PERSISTENT_ATTRIBUTE_INVALID_VERSION_MAPPING_TYPE";
-
-	public static final String PERSISTENCE_UNIT_LEGACY_DESCRIPTOR_CUSTOMIZER = "PERSISTENCE_UNIT_LEGACY_DESCRIPTOR_CUSTOMIZER";
-	
-	public static final String PERSISTENCE_UNIT_LEGACY_ENTITY_CACHING = "PERSISTENCE_UNIT_LEGACY_ENTITY_CACHING";
-
-	public static final String PERSISTENCE_UNIT_CACHING_PROPERTY_IGNORED = "PERSISTENCE_UNIT_CACHING_PROPERTY_IGNORED";
-
-	public static final String SESSION_CUSTOMIZER_CLASS_NOT_SPECIFIED = "SESSION_CUSTOMIZER_CLASS_NOT_SPECIFIED";
-	
-	public static final String SESSION_CUSTOMIZER_CLASS_NOT_EXIST = "SESSION_CUSTOMIZER_CLASS_NOT_EXIST";
-
-	public static final String SESSION_CUSTOMIZER_CLASS_NOT_VALID = "SESSION_CUSTOMIZER_CLASS_NOT_VALID";
-
-	public static final String SESSION_CUSTOMIZER_CLASS_IMPLEMENTS_SESSION_CUSTOMIZER = "SESSION_CUSTOMIZER_CLASS_IMPLEMENTS_SESSION_CUSTOMIZER";
-
-	public static final String SESSION_LOGGER_CLASS_NOT_SPECIFIED = "SESSION_LOGGER_CLASS_NOT_SPECIFIED";
-	
-	public static final String SESSION_LOGGER_CLASS_NOT_EXIST = "SESSION_LOGGER_CLASS_NOT_EXIST";
-	
-	public static final String SESSION_LOGGER_CLASS_IMPLEMENTS_SESSION_LOG = "SESSION_LOGGER_CLASS_IMPLEMENTS_SESSION_LOG";
-	
-	public static final String SESSION_PROFILER_CLASS_NOT_SPECIFIED = "SESSION_PROFILER_CLASS_NOT_SPECIFIED";
-	
-	public static final String SESSION_PROFILER_CLASS_NOT_EXIST = "SESSION_PROFILER_CLASS_NOT_EXIST";
-	
-	public static final String SESSION_PROFILER_CLASS_NOT_VALID = "SESSION_PROFILER_CLASS_NOT_VALID";
-	
-	public static final String SESSION_PROFILER_CLASS_IMPLEMENTS_SESSIONP_ROFILER = "SESSION_PROFILER_CLASS_IMPLEMENTS_SESSION_PROFILER";
-
-	public static final String BASIC_COLLECTION_MAPPING_DEPRECATED = "BASIC_COLLECTION_MAPPING_DEPRECATED";
-	
-	public static final String BASIC_MAP_MAPPING_DEPRECATED = "BASIC_MAP_MAPPING_DEPRECATED";
-
-	public static final String TYPE_MAPPING_MEMBER_CLASS_NOT_STATIC = "TYPE_MAPPING_MEMBER_CLASS_NOT_STATIC";
-
-}
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
deleted file mode 100644
index d6d8ed6086..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkOrmResourceModelProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.content.IContentType;
-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.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
-
-/**
- * EclipseLink orm.xml
- */
-public class EclipseLinkOrmResourceModelProvider
-	implements JpaResourceModelProvider
-{
-	// singleton
-	private static final JpaResourceModelProvider INSTANCE = new EclipseLinkOrmResourceModelProvider();
-	
-	
-	/**
-	 * Return the singleton
-	 */
-	public static JpaResourceModelProvider instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkOrmResourceModelProvider() {
-		super();
-	}
-	
-	
-	public IContentType getContentType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-	
-	public JpaXmlResource 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/AbstractEclipseLinkTypeMappingValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/AbstractEclipseLinkTypeMappingValidator.java
deleted file mode 100644
index 0ada0fb11b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/AbstractEclipseLinkTypeMappingValidator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context;
-
-import java.util.List;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.jpa.core.context.TypeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractTypeMappingValidator;
-import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public abstract class AbstractEclipseLinkTypeMappingValidator<T extends TypeMapping>
-	extends AbstractTypeMappingValidator<T>
-{
-	protected AbstractEclipseLinkTypeMappingValidator(T typeMapping, JavaResourceType jrt, TypeMappingTextRangeResolver textRangeResolver) {
-		super(typeMapping, jrt, textRangeResolver);
-	}
-
-
-	@Override
-	protected void validateType(List<IMessage> messages) {
-		if (this.isMemberType() && !this.isStaticType()) {
-			messages.add(this.buildEclipseLinkTypeMessage(EclipseLinkJpaValidationMessages.TYPE_MAPPING_MEMBER_CLASS_NOT_STATIC));
-		}
-		if (!this.hasNoArgConstructor()) {
-			messages.add(this.buildTypeMessage(JpaValidationMessages.TYPE_MAPPING_CLASS_MISSING_NO_ARG_CONSTRUCTOR));
-		}
-	}
-
-	protected IMessage buildEclipseLinkTypeMessage(String msgID) {
-		return DefaultEclipseLinkJpaValidationMessages.buildMessage(
-				IMessage.HIGH_SEVERITY,
-				msgID,
-				new String[] {this.typeMapping.getName()},
-				this.typeMapping,
-				this.textRangeResolver.getTypeMappingTextRange()
-			);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkConvertValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkConvertValidator.java
deleted file mode 100644
index 8a9057b880..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkConvertValidator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context;
-
-import java.util.List;
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkConvertValidator
-	implements JptValidator
-{
-	protected final EclipseLinkConvert convert;
-
-	protected final ConverterTextRangeResolver textRangeResolver;
-
-
-	public EclipseLinkConvertValidator(EclipseLinkConvert convert, ConverterTextRangeResolver textRangeResolver) {
-		super();
-		this.convert = convert;
-		this.textRangeResolver = textRangeResolver;
-	}
-
-	protected AttributeMapping getAttributeMapping() {
-		return this.convert.getParent();
-	}
-
-	protected EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return this.convert.getPersistenceUnit();
-	}
-
-	/**
-	 * The converters are validated in the persistence unit.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit#validateConverters(List, IReporter)
-	 */
-	public boolean validate(List<IMessage> messages, IReporter reporter) {
-		// converters are validated in the persistence unit
-		return this.validateConverterName(messages);
-	}
-
-	
-	private boolean validateConverterName(List<IMessage> messages) {
-		String converterName = this.convert.getConverterName();
-		if (converterName == null) {
-			return true;
-		}
-
-		if (CollectionTools.contains(this.getPersistenceUnit().getUniqueConverterNames(), converterName)) {
-			return true;
-		}
-
-		if (ArrayTools.contains(EclipseLinkConvert.RESERVED_CONVERTER_NAMES, converterName)) {
-			return true;
-		}
-
-		messages.add(
-			DefaultEclipseLinkJpaValidationMessages.buildMessage(
-				IMessage.HIGH_SEVERITY,
-				EclipseLinkJpaValidationMessages.ID_MAPPING_UNRESOLVED_CONVERTER_NAME,
-				new String[] {
-					converterName,
-					this.getAttributeMapping().getName()
-				},
-				this.getAttributeMapping(),
-				this.textRangeResolver.getConverterTextRange()
-			)
-		);
-		return false;
-	}
-
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkEntityPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkEntityPrimaryKeyValidator.java
deleted file mode 100644
index b0c1a88645..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkEntityPrimaryKeyValidator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.TypeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.PrimaryKeyTextRangeResolver;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractEntityPrimaryKeyValidator;
-import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeMapping;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkEntityPrimaryKeyValidator
-	extends AbstractEntityPrimaryKeyValidator
-{
-	public EclipseLinkEntityPrimaryKeyValidator(
-			EclipseLinkEntity entity, PrimaryKeyTextRangeResolver textRangeResolver) {
-		
-		super(entity, textRangeResolver);
-	}
-	
-	
-	@Override
-	protected EclipseLinkEntity entity() {
-		return (EclipseLinkEntity) typeMapping();
-	}
-	
-	// in EclipseLink, a hierarchy may define its primary key on multiple classes, so long as the
-	// root entity has a coherent defined primary key.
-	// However, the id class may only be defined on one class in the hierarchy.
-	@Override
-	protected void validatePrimaryKeyIsNotRedefined(List<IMessage> messages, IReporter reporter) {
-		if (idClassReference().isSpecified() && definesIdClassOnAncestor(typeMapping())) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.TYPE_MAPPING_ID_CLASS_REDEFINED,
-						new String[0],
-						typeMapping(),
-						textRangeResolver().getIdClassTextRange()));
-		}
-	}
-	
-	@Override
-	protected boolean definesPrimaryKey(TypeMapping typeMapping) {
-		return super.definesPrimaryKey(typeMapping)
-			|| ((EclipseLinkTypeMapping) typeMapping).usesPrimaryKeyColumns();
-	}
-	
-	@Override
-	protected boolean specifiesIdClass() {
-		return super.specifiesIdClass() || definesIdClass(typeMapping());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassPrimaryKeyValidator.java
deleted file mode 100644
index c19560b114..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassPrimaryKeyValidator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.TypeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.PrimaryKeyTextRangeResolver;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractMappedSuperclassPrimaryKeyValidator;
-import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages;
-import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeMapping;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkMappedSuperclassPrimaryKeyValidator
-	extends AbstractMappedSuperclassPrimaryKeyValidator
-{
-	public EclipseLinkMappedSuperclassPrimaryKeyValidator(
-			EclipseLinkMappedSuperclass mappedSuperclass, PrimaryKeyTextRangeResolver textRangeResolver) {
-		
-		super(mappedSuperclass, textRangeResolver);
-	}
-	
-	
-	@Override
-	protected EclipseLinkMappedSuperclass mappedSuperclass() {
-		return (EclipseLinkMappedSuperclass) typeMapping();
-	}
-	
-	// in EclipseLink, a hierarchy may define its primary key on multiple classes, so long as the
-	// root entity has a coherent defined primary key.
-	// However, the id class may only be defined on one class in the hierarchy.
-	@Override
-	protected void validatePrimaryKeyIsNotRedefined(List<IMessage> messages, IReporter reporter) {
-		if (idClassReference().isSpecified() && definesIdClassOnAncestor(typeMapping())) {
-			messages.add(
-					DefaultJpaValidationMessages.buildMessage(
-						IMessage.HIGH_SEVERITY,
-						JpaValidationMessages.TYPE_MAPPING_ID_CLASS_REDEFINED,
-						new String[0],
-						typeMapping(),
-						textRangeResolver().getIdClassTextRange()));
-		}
-	}
-	
-	// in EclipseLink, it's only the root entity where this matters
-	@Override
-	protected void validateIdClassIsUsedIfNecessary(List<IMessage> messages, IReporter reporter) {
-		// no op
-	}
-	
-	// in EclipseLink, it's only the root entity where this matters
-	@Override
-	protected void validateIdClass(JavaPersistentType idClass, List<IMessage> messages, IReporter reporter) {
-		// no op
-	}
-	
-	@Override
-	protected boolean definesPrimaryKey(TypeMapping typeMapping) {
-		return super.definesPrimaryKey(typeMapping)
-			|| ((EclipseLinkTypeMapping) typeMapping).usesPrimaryKeyColumns();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassValidator.java
deleted file mode 100644
index aab2123010..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkMappedSuperclassValidator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context;
-
-import java.util.List;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
-import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver;
-import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class EclipseLinkMappedSuperclassValidator
-	extends AbstractEclipseLinkTypeMappingValidator<MappedSuperclass>
-{
-	public EclipseLinkMappedSuperclassValidator(MappedSuperclass mappedSuperclass, JavaResourceType jrt, TypeMappingTextRangeResolver textRangeResolver) {
-		super(mappedSuperclass, jrt, textRangeResolver);
-	}
-
-
-	@Override
-	protected void validateType(List<IMessage> messages) {
-		if (this.isFinalType()) {
-			messages.add(this.buildTypeMessage(JpaValidationMessages.TYPE_MAPPING_FINAL_CLASS));
-		}
-		super.validateType(messages);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkPersistentAttributeValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkPersistentAttributeValidator.java
deleted file mode 100644
index 1a0f14d1b7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkPersistentAttributeValidator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.PersistentAttributeTextRangeResolver;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.AbstractPersistentAttributeValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-public class EclipseLinkPersistentAttributeValidator
-	extends AbstractPersistentAttributeValidator
-{
-	public EclipseLinkPersistentAttributeValidator(
-		ReadOnlyPersistentAttribute persistentAttribute, PersistentAttributeTextRangeResolver textRangeResolver)
-	{
-		super(persistentAttribute, textRangeResolver);
-	}
-
-	/**
-	 * EclipseLink does not have the same restrictions on the
-	 * attribute as the JPA spec does (e.g. the spec prohibits a field from
-	 * being public).
-	 */
-	@Override
-	protected void validateMappedAttribute(List<IMessage> messages) {
-		return;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkTypeMappingValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkTypeMappingValidator.java
deleted file mode 100644
index a2f720f05f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/EclipseLinkTypeMappingValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context;
-
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.jpa.core.context.TypeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.TypeMappingTextRangeResolver;
-
-public class EclipseLinkTypeMappingValidator
-	extends AbstractEclipseLinkTypeMappingValidator<TypeMapping>
-{
-	public EclipseLinkTypeMappingValidator(TypeMapping typeMapping, JavaResourceType jrt, TypeMappingTextRangeResolver textRangeResolver) {
-		super(typeMapping, jrt, textRangeResolver);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMappingDefinition.java
deleted file mode 100644
index 9697611f6b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMappingDefinition.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicCollectionAnnotation;
-
-public class EclipseLinkJavaBasicCollectionMappingDefinition
-	implements JavaAttributeMappingDefinition
-{
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaBasicCollectionMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaBasicCollectionMappingDefinition() {
-		super();
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkBasicCollectionAnnotation.ANNOTATION_NAME;
-	}
-
-	public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
-		return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null;
-	}
-
-	public Iterable<String> getSupportingAnnotationNames() {
-		return EmptyIterable.instance();
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildJavaEclipseLinkBasicCollectionMapping(persistentAttribute);
-	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMappingDefinition.java
deleted file mode 100644
index 498cbfbb94..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMappingDefinition.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicMapAnnotation;
-
-public class EclipseLinkJavaBasicMapMappingDefinition
-	implements JavaAttributeMappingDefinition
-{
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaBasicMapMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaBasicMapMappingDefinition() {
-		super();
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkBasicMapAnnotation.ANNOTATION_NAME;
-	}
-
-	public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
-		return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null;
-	}
-
-	public Iterable<String> getSupportingAnnotationNames() {
-		return EmptyIterable.instance();
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildJavaEclipseLinkBasicMapMapping(persistentAttribute);
-	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition.java
deleted file mode 100644
index 2c0ab5a74a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.DefaultJavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConvertAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkMutableAnnotation;
-
-public class EclipseLinkJavaBasicMappingDefinition
-	extends DefaultJavaAttributeMappingDefinitionWrapper
-{
-	private static final DefaultJavaAttributeMappingDefinition DELEGATE = JavaBasicMappingDefinition.instance();
-
-	// singleton
-	private static final DefaultJavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaBasicMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaBasicMappingDefinition() {
-		super();
-	}
-
-	@Override
-	protected DefaultJavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	private static final String[] ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkMutableAnnotation.ANNOTATION_NAME,
-		EclipseLinkConvertAnnotation.ANNOTATION_NAME,
-	};
-	// 'public' because the EclipseLink Id and Version mappings also support these annotations
-	public static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableDefinition.java
deleted file mode 100644
index f84d80d3e0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableDefinition.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddableDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkChangeTrackingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCustomizerAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkObjectTypeConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkStructConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTypeConverterAnnotation;
-
-public class EclipseLinkJavaEmbeddableDefinition
-	extends JavaTypeMappingDefinitionWrapper
-{
-	private static final JavaTypeMappingDefinition DELEGATE = JavaEmbeddableDefinition.instance();
-
-	// singleton
-	private static final JavaTypeMappingDefinition INSTANCE = new EclipseLinkJavaEmbeddableDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaEmbeddableDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaTypeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	private static final String[] ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkChangeTrackingAnnotation.ANNOTATION_NAME,
-		EclipseLinkConverterAnnotation.ANNOTATION_NAME,
-		EclipseLinkCustomizerAnnotation.ANNOTATION_NAME,
-		EclipseLinkObjectTypeConverterAnnotation.ANNOTATION_NAME,
-		EclipseLinkStructConverterAnnotation.ANNOTATION_NAME,
-		EclipseLinkTypeConverterAnnotation.ANNOTATION_NAME,
-	};
-	public static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEntityDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEntityDefinition.java
deleted file mode 100644
index 7477386ae0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEntityDefinition.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaEntityDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCacheAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkChangeTrackingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCustomizerAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkExistenceCheckingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkObjectTypeConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkReadOnlyAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkStructConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTypeConverterAnnotation;
-
-public class EclipseLinkJavaEntityDefinition
-	extends JavaTypeMappingDefinitionWrapper
-{
-	private static final JavaTypeMappingDefinition DELEGATE = JavaEntityDefinition.instance();
-
-	// singleton
-	private static final JavaTypeMappingDefinition INSTANCE = new EclipseLinkJavaEntityDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaEntityDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaTypeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	private static final String[] ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkCacheAnnotation.ANNOTATION_NAME,
-		EclipseLinkChangeTrackingAnnotation.ANNOTATION_NAME,
-		EclipseLinkConverterAnnotation.ANNOTATION_NAME,
-		EclipseLinkCustomizerAnnotation.ANNOTATION_NAME,
-		EclipseLinkExistenceCheckingAnnotation.ANNOTATION_NAME,
-		EclipseLinkObjectTypeConverterAnnotation.ANNOTATION_NAME,
-		EclipseLinkReadOnlyAnnotation.ANNOTATION_NAME,
-		EclipseLinkStructConverterAnnotation.ANNOTATION_NAME,
-		EclipseLinkTypeConverterAnnotation.ANNOTATION_NAME,
-	};
-	// 'public' because EclipseLink MappedSuperclass also supports these annotations
-	public static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingDefinition.java
deleted file mode 100644
index 7bbfb2547b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingDefinition.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaIdMappingDefinition;
-
-public class EclipseLinkJavaIdMappingDefinition
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaIdMappingDefinition.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaIdMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaIdMappingDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaBasicMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingDefinition.java
deleted file mode 100644
index 2fb4b88c87..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingDefinition.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaManyToManyMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-
-public class EclipseLinkJavaManyToManyMappingDefinition
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaManyToManyMappingDefinition.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaManyToManyMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaManyToManyMappingDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	public static final String[] ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkJoinFetchAnnotation.ANNOTATION_NAME
-	};
-	public static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingDefinition.java
deleted file mode 100644
index ecbf7312e0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingDefinition.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaManyToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-
-public class EclipseLinkJavaManyToOneMappingDefinition
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaManyToOneMappingDefinition.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaManyToOneMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaManyToOneMappingDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	private static final String[] ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkJoinFetchAnnotation.ANNOTATION_NAME
-	};
-	public static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassDefinition.java
deleted file mode 100644
index 2bcb1ca038..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassDefinition.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaMappedSuperclassDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
-
-public class EclipseLinkJavaMappedSuperclassDefinition
-	extends JavaTypeMappingDefinitionWrapper
-{
-	private static final JavaTypeMappingDefinition DELEGATE = JavaMappedSuperclassDefinition.instance();
-
-	// singleton
-	private static final JavaTypeMappingDefinition INSTANCE = new EclipseLinkJavaMappedSuperclassDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaMappedSuperclassDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaTypeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaEntityDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition.java
deleted file mode 100644
index eb09de2581..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToManyMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrivateOwnedAnnotation;
-
-public class EclipseLinkJavaOneToManyMappingDefinition
-	extends JavaAttributeMappingDefinitionWrapper
-	implements DefaultJavaAttributeMappingDefinition
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaOneToManyMappingDefinition.instance();
-
-	// singleton
-	private static final DefaultJavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaOneToManyMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaOneToManyMappingDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	private static final String[] ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkJoinFetchAnnotation.ANNOTATION_NAME,
-		EclipseLinkPrivateOwnedAnnotation.ANNOTATION_NAME
-	};
-	public static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-
-	public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
-		String targetEntity = persistentAttribute.getMultiReferenceTargetTypeName();
-		return (targetEntity != null)
-				&& (persistentAttribute.getPersistenceUnit().getEntity(targetEntity) != null);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyRelationship.java
deleted file mode 100644
index 6d4ffac8f1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyRelationship.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
-import org.eclipse.jpt.jpa.core.internal.context.java.GenericJavaOneToManyRelationship;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.java.EclipseLinkJavaOneToManyRelationship2_0;
-
-/**
- * We need this class because the EclipseLink 1.0 1:m mapping supports a join
- * column strategy while JPA did not until JPA 2.0. As a result, we need a class
- * that implements EclipseLink 1.0.
- */
-public class EclipseLinkJavaOneToManyRelationship
-	extends GenericJavaOneToManyRelationship
-	implements EclipseLinkJavaOneToManyRelationship2_0
-{
-	public EclipseLinkJavaOneToManyRelationship(JavaOneToManyMapping parent) {
-		super(parent, true);  // true=supports join column strategy
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition.java
deleted file mode 100644
index fa78682973..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrivateOwnedAnnotation;
-
-public class EclipseLinkJavaOneToOneMappingDefinition
-	extends JavaAttributeMappingDefinitionWrapper
-	implements DefaultJavaAttributeMappingDefinition
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaOneToOneMappingDefinition.instance();
-
-	// singleton
-	private static final DefaultJavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaOneToOneMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaOneToOneMappingDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	private static final String[] ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkJoinFetchAnnotation.ANNOTATION_NAME,
-		EclipseLinkPrivateOwnedAnnotation.ANNOTATION_NAME
-	};
-	public static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-
-	public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
-		String targetEntity = persistentAttribute.getSingleReferenceTargetTypeName();
-		return (targetEntity != null)
-				&& (persistentAttribute.getPersistenceUnit().getEntity(targetEntity) != null);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java
deleted file mode 100644
index d04f0dc00b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTimeOfDay;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTimeOfDayAnnotation;
-
-public class EclipseLinkJavaTimeOfDay
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkTimeOfDay
-{
-	protected final EclipseLinkTimeOfDayAnnotation todAnnotation;
-
-	protected Integer hour;
-	protected Integer minute;
-	protected Integer second;
-	protected Integer millisecond;
-
-
-	public EclipseLinkJavaTimeOfDay(JavaEclipseLinkCaching parent, EclipseLinkTimeOfDayAnnotation todAnnotation) {
-		super(parent);
-		this.todAnnotation = todAnnotation;
-		this.hour = todAnnotation.getHour();
-		this.minute = todAnnotation.getMinute();
-		this.second = todAnnotation.getSecond();
-		this.millisecond = todAnnotation.getMillisecond();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setHour_(this.todAnnotation.getHour());
-		this.setMinute_(this.todAnnotation.getMinute());
-		this.setSecond_(this.todAnnotation.getSecond());
-		this.setMillisecond_(this.todAnnotation.getMillisecond());
-	}
-
-
-	// ********** hour **********
-
-	public Integer getHour() {
-		return this.hour;
-	}
-
-	public void setHour(Integer hour) {
-		this.todAnnotation.setHour(hour);
-		this.setHour_(hour);
-	}
-
-	protected void setHour_(Integer hour) {
-		Integer old = this.hour;
-		this.hour = hour;
-		this.firePropertyChanged(HOUR_PROPERTY, old, hour);
-	}
-
-
-	// ********** minute **********
-
-	public Integer getMinute() {
-		return this.minute;
-	}
-
-	public void setMinute(Integer minute) {
-		this.todAnnotation.setMinute(minute);
-		this.setMinute_(minute);
-	}
-
-	protected void setMinute_(Integer minute) {
-		Integer old = this.minute;
-		this.minute = minute;
-		this.firePropertyChanged(MINUTE_PROPERTY, old, minute);
-	}
-
-
-	// ********** second **********
-
-	public Integer getSecond() {
-		return this.second;
-	}
-
-	public void setSecond(Integer second) {
-		this.todAnnotation.setSecond(second);
-		this.setSecond_(second);
-	}
-
-	protected void setSecond_(Integer second) {
-		Integer old = this.second;
-		this.second = second;
-		this.firePropertyChanged(SECOND_PROPERTY, old, second);
-	}
-
-
-	// ********** millisecond **********
-
-	public Integer getMillisecond() {
-		return this.millisecond;
-	}
-
-	public void setMillisecond(Integer millisecond) {
-		this.todAnnotation.setMillisecond(millisecond);
-		this.setMillisecond_(millisecond);
-	}
-
-	protected void setMillisecond_(Integer millisecond) {
-		Integer old = this.millisecond;
-		this.millisecond = millisecond;
-		this.firePropertyChanged(MILLISECOND_PROPERTY, old, millisecond);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaEclipseLinkCaching getParent() {
-		return (JavaEclipseLinkCaching) super.getParent();
-	}
-
-	public JavaEclipseLinkCaching getCaching() {
-		return this.getParent();
-	}
-
-	public EclipseLinkTimeOfDayAnnotation getTimeOfDayAnnotation() {
-		return this.todAnnotation;
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.todAnnotation.getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getCaching().getValidationTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMappingDefinition.java
deleted file mode 100644
index 5319654deb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMappingDefinition.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformationAnnotation;
-
-public class EclipseLinkJavaTransformationMappingDefinition
-	implements JavaAttributeMappingDefinition
-{
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaTransformationMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaTransformationMappingDefinition() {
-		super();
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkTransformationAnnotation.ANNOTATION_NAME;
-	}
-
-	public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
-		return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null;
-	}
-
-	public Iterable<String> getSupportingAnnotationNames() {
-		return EmptyIterable.instance();
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildJavaEclipseLinkTransformationMapping(persistentAttribute);
-	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition.java
deleted file mode 100644
index f72dc3ea9d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkVariableOneToOneAnnotation;
-
-public class EclipseLinkJavaVariableOneToOneMappingDefinition
-	implements DefaultJavaAttributeMappingDefinition
-{
-	// singleton
-	private static final DefaultJavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaVariableOneToOneMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaVariableOneToOneMappingDefinition() {
-		super();
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkVariableOneToOneAnnotation.ANNOTATION_NAME;
-	}
-
-	public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
-		return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null;
-	}
-
-	public Iterable<String> getSupportingAnnotationNames() {
-		return EmptyIterable.instance();
-	}
-
-	public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
-		return ((EclipseLinkJpaFactory) factory).buildJavaEclipseLinkVariableOneToOneMapping(persistentAttribute);
-	}
-
-	public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
-		return ((JavaEclipseLinkPersistentAttribute) persistentAttribute).typeIsValidForVariableOneToOne();
-	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingDefinition.java
deleted file mode 100644
index 71d233c1ec..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMappingDefinition.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaVersionMappingDefinition;
-
-public class EclipseLinkJavaVersionMappingDefinition
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaVersionMappingDefinition.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaVersionMappingDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaVersionMappingDefinition() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaBasicMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java
deleted file mode 100644
index 02d43ef7d1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentAttribute2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicCollectionAnnotation;
-
-public class JavaEclipseLinkBasicCollectionMapping
-	extends AbstractJavaAttributeMapping<EclipseLinkBasicCollectionAnnotation>
-	implements EclipseLinkBasicCollectionMapping
-{
-	
-	public JavaEclipseLinkBasicCollectionMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	@Override
-	protected String getAnnotationName() {
-		return EclipseLinkBasicCollectionAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** metamodel **********  
-	@Override
-	protected String getMetamodelFieldTypeName() {
-		return ((JavaPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName();
-	}
-
-	@Override
-	public String getMetamodelTypeName() {
-		String targetTypeName = this.getPersistentAttribute().getMultiReferenceTargetTypeName();
-		return (targetTypeName != null) ? targetTypeName : MetamodelField.DEFAULT_TYPE_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java
deleted file mode 100644
index b96b46292d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.ArrayList;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentAttribute2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicMapAnnotation;
-
-public class JavaEclipseLinkBasicMapMapping
-	extends AbstractJavaAttributeMapping<EclipseLinkBasicMapAnnotation>
-	implements EclipseLinkBasicMapMapping
-{
-	
-	public JavaEclipseLinkBasicMapMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	@Override
-	protected String getAnnotationName() {
-		return EclipseLinkBasicMapAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** metamodel **********  
-	@Override
-	protected String getMetamodelFieldTypeName() {
-		return ((JavaPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName();
-	}
-
-	@Override
-	public String getMetamodelTypeName() {
-		String targetTypeName = this.getPersistentAttribute().getMultiReferenceTargetTypeName();
-		return (targetTypeName != null) ? targetTypeName : MetamodelField.DEFAULT_TYPE_NAME;
-	}
-
-	@Override
-	protected void addMetamodelFieldTypeArgumentNamesTo(ArrayList<String> typeArgumentNames) {
-		this.addMetamodelFieldMapKeyTypeArgumentNameTo(typeArgumentNames);
-		super.addMetamodelFieldTypeArgumentNamesTo(typeArgumentNames);
-	}
-
-	protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) {
-		String mapKeyTypeName = this.getPersistentAttribute().getMultiReferenceMapKeyTypeName();
-		mapKeyTypeName = mapKeyTypeName != null ? mapKeyTypeName : MetamodelField.DEFAULT_TYPE_NAME;
-		typeArgumentNames.add(mapKeyTypeName);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java
deleted file mode 100644
index da41f55e9d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaConverter;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBasicMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkBasicMapping
-	extends AbstractJavaBasicMapping
-	implements EclipseLinkBasicMapping
-{
-	protected final JavaEclipseLinkMutable mutable;
-
-
-	public JavaEclipseLinkBasicMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.mutable = new JavaEclipseLinkMutable(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.mutable.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-
-
-	// ********** mutable **********
-
-	public EclipseLinkMutable getMutable() {
-		return this.mutable;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * put the EclipseLink convert adapter first - this is the order EclipseLink searches
-	 */
-	@Override
-	protected Iterable<JavaConverter.Adapter> getConverterAdapters() {
-		return new CompositeIterable<JavaConverter.Adapter>(
-				JavaEclipseLinkConvert.Adapter.instance(),
-				super.getConverterAdapters()
-			);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.mutable.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java
deleted file mode 100644
index 45bfa8aac6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCachingImpl.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.TypeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.CacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCacheCoordinationType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCacheType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkExistenceType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTimeOfDay;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkNonEmbeddableTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCacheAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkExistenceCheckingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTimeOfDayAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkCachingImpl
-	extends AbstractJavaJpaContextNode
-	implements JavaEclipseLinkCaching, JavaCacheableHolder2_0
-{
-	protected EclipseLinkCacheType specifiedType;
-	protected Integer specifiedSize;
-	protected Boolean specifiedShared;
-	protected Boolean specifiedAlwaysRefresh;
-	protected Boolean specifiedRefreshOnlyIfNewer;
-	protected Boolean specifiedDisableHits;
-
-	protected EclipseLinkCacheCoordinationType specifiedCoordinationType;
-
-	protected Integer expiry;
-	protected EclipseLinkJavaTimeOfDay expiryTimeOfDay;
-
-	protected boolean existenceChecking;
-	protected EclipseLinkExistenceType specifiedExistenceType;
-	protected EclipseLinkExistenceType defaultExistenceType;
-
-	protected final JavaCacheable2_0 cacheable;
-
-
-	public JavaEclipseLinkCachingImpl(JavaEclipseLinkNonEmbeddableTypeMapping parent) {
-		super(parent);
-
-		EclipseLinkCacheAnnotation cacheAnnotation = this.getCacheAnnotation();
-		this.specifiedType = EclipseLinkCacheType.fromJavaResourceModel(cacheAnnotation.getType());
-		this.specifiedSize = cacheAnnotation.getSize();
-		this.specifiedShared = cacheAnnotation.getShared();
-		this.specifiedAlwaysRefresh = cacheAnnotation.getAlwaysRefresh();
-		this.specifiedRefreshOnlyIfNewer = cacheAnnotation.getRefreshOnlyIfNewer();
-		this.specifiedDisableHits = cacheAnnotation.getDisableHits();
-
-		this.specifiedCoordinationType = EclipseLinkCacheCoordinationType.fromJavaResourceModel(cacheAnnotation.getCoordinationType());
-
-		this.expiry = cacheAnnotation.getExpiry();
-		this.expiryTimeOfDay = this.buildExpiryTimeOfDay(cacheAnnotation.getExpiryTimeOfDay());
-
-		EclipseLinkExistenceCheckingAnnotation ecAnnotation = this.getExistenceCheckingAnnotation();
-		this.existenceChecking = (ecAnnotation != null);
-		this.specifiedExistenceType = this.buildSpecifiedExistenceType(ecAnnotation);
-
-		this.cacheable = this.buildCacheable();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-
-		EclipseLinkCacheAnnotation cacheAnnotation = this.getCacheAnnotation();
-		this.setSpecifiedType_(EclipseLinkCacheType.fromJavaResourceModel(cacheAnnotation.getType()));
-		this.setSpecifiedSize_(cacheAnnotation.getSize());
-		this.setSpecifiedShared_(cacheAnnotation.getShared());
-		this.setSpecifiedAlwaysRefresh_(cacheAnnotation.getAlwaysRefresh());
-		this.setSpecifiedRefreshOnlyIfNewer_(cacheAnnotation.getRefreshOnlyIfNewer());
-		this.setSpecifiedDisableHits_(cacheAnnotation.getDisableHits());
-
-		this.setSpecifiedCoordinationType_(EclipseLinkCacheCoordinationType.fromJavaResourceModel(cacheAnnotation.getCoordinationType()));
-
-		this.setExpiry_(cacheAnnotation.getExpiry());
-		this.syncExpiryTimeOfDay(cacheAnnotation.getExpiryTimeOfDay());
-
-		EclipseLinkExistenceCheckingAnnotation ecAnnotation = this.getExistenceCheckingAnnotation();
-		this.setExistenceChecking_(ecAnnotation != null);
-		this.setSpecifiedExistenceType_(this.buildSpecifiedExistenceType(ecAnnotation));
-
-		this.cacheable.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		if (this.expiryTimeOfDay != null) {
-			this.expiryTimeOfDay.update();
-		}
-		this.setDefaultExistenceType(this.buildDefaultExistenceType());
-		this.cacheable.update();
-	}
-
-
-	// ********** type **********
-
-	public EclipseLinkCacheType getType() {
-		return (this.specifiedType != null) ? this.specifiedType : this.getDefaultType();
-	}
-
-	public EclipseLinkCacheType getSpecifiedType() {
-		return this.specifiedType;
-	}
-
-	public void setSpecifiedType(EclipseLinkCacheType type) {
-		this.getCacheAnnotation().setType(EclipseLinkCacheType.toJavaResourceModel(type));
-		this.setSpecifiedType_(type);
-
-		if (type != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedType_(EclipseLinkCacheType type) {
-		EclipseLinkCacheType old = this.specifiedType;
-		this.specifiedType = type;
-		this.firePropertyChanged(SPECIFIED_TYPE_PROPERTY, old, type);
-	}
-
-	public EclipseLinkCacheType getDefaultType() {
-		String puDefaultCacheTypeName = ((EclipseLinkPersistenceUnit)getPersistenceUnit()).getDefaultCacheTypePropertyValue();
-		if (!StringTools.stringIsEmpty(puDefaultCacheTypeName)) {
-			try { 
-				return EclipseLinkCacheType.valueOf(StringTools.convertCamelCaseToAllCaps(puDefaultCacheTypeName));
-			} catch (IllegalArgumentException exception) {
-				//no match, return default
-			}
-		}
-		return DEFAULT_TYPE;
-	}
-	
-	// ********** size **********
-
-	public int getSize() {
-		return (this.specifiedSize != null) ? this.specifiedSize.intValue() : this.getDefaultSize();
-	}
-
-	public Integer getSpecifiedSize() {
-		return this.specifiedSize;
-	}
-
-	public void setSpecifiedSize(Integer size) {
-		this.getCacheAnnotation().setSize(size);
-		this.setSpecifiedSize_(size);
-
-		if (size != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedSize_(Integer size) {
-		Integer old = this.specifiedSize;
-		this.specifiedSize = size;
-		this.firePropertyChanged(SPECIFIED_SIZE_PROPERTY, old, size);
-	}
-
-	public int getDefaultSize() {
-		String puDefaultCacheSize = ((EclipseLinkPersistenceUnit)getPersistenceUnit()).getDefaultCacheSizePropertyValue();
-		if (!StringTools.stringIsEmpty(puDefaultCacheSize)) {
-			try {
-				return Integer.valueOf(puDefaultCacheSize).intValue();
-			} catch (NumberFormatException exception) {
-				//couldn't parse, return default
-			}
-		}
-		return DEFAULT_SIZE;
-	}
-
-
-	// ********** shared **********
-
-	public boolean isShared() {
-		return (this.specifiedShared != null) ? this.specifiedShared.booleanValue() : this.isDefaultShared();
-	}
-
-	public Boolean getSpecifiedShared() {
-		return this.specifiedShared;
-	}
-
-	public void setSpecifiedShared(Boolean shared) {
-		this.getCacheAnnotation().setShared(shared);
-		this.setSpecifiedShared_(shared);
-
-		if ((shared != null) && ! shared.booleanValue()) {  // Boolean.FALSE
-			this.setSpecifiedType(null);
-			this.setSpecifiedSize(null);
-			this.setSpecifiedAlwaysRefresh(null);
-			this.setSpecifiedRefreshOnlyIfNewer(null);
-			this.setSpecifiedDisableHits(null);
-			this.setSpecifiedCoordinationType(null);
-			this.setExpiry(null);
-			this.removeExpiryTimeOfDayIfNecessary();
-		}
-	}
-
-	protected void setSpecifiedShared_(Boolean shared) {
-		Boolean old = this.specifiedShared;
-		this.specifiedShared = shared;
-		this.firePropertyChanged(SPECIFIED_SHARED_PROPERTY, old, shared);
-	}
-
-	public boolean isDefaultShared() {
-		String puDefaultSharedCache = ((EclipseLinkPersistenceUnit)getPersistenceUnit()).getDefaultCacheSharedPropertyValue();
-		return !StringTools.stringIsEmpty(puDefaultSharedCache) ? Boolean.valueOf(puDefaultSharedCache) : DEFAULT_SHARED;
-	}
-
-
-	// ********** always refresh **********
-
-	public boolean isAlwaysRefresh() {
-		return (this.specifiedAlwaysRefresh != null) ? this.specifiedAlwaysRefresh.booleanValue() : this.isDefaultAlwaysRefresh();
-	}
-
-	public Boolean getSpecifiedAlwaysRefresh() {
-		return this.specifiedAlwaysRefresh;
-	}
-
-	public void setSpecifiedAlwaysRefresh(Boolean alwaysRefresh) {
-		this.getCacheAnnotation().setAlwaysRefresh(alwaysRefresh);
-		this.setSpecifiedAlwaysRefresh_(alwaysRefresh);
-
-		if (alwaysRefresh != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedAlwaysRefresh_(Boolean alwaysRefresh) {
-		Boolean old = this.specifiedAlwaysRefresh;
-		this.specifiedAlwaysRefresh = alwaysRefresh;
-		this.firePropertyChanged(SPECIFIED_ALWAYS_REFRESH_PROPERTY, old, alwaysRefresh);
-	}
-
-	public boolean isDefaultAlwaysRefresh() {
-		return DEFAULT_ALWAYS_REFRESH;
-	}
-
-
-	// ********** refresh only if newer **********
-
-	public boolean isRefreshOnlyIfNewer() {
-		return (this.specifiedRefreshOnlyIfNewer != null) ? this.specifiedRefreshOnlyIfNewer.booleanValue() : this.isDefaultRefreshOnlyIfNewer();
-	}
-
-	public Boolean getSpecifiedRefreshOnlyIfNewer() {
-		return this.specifiedRefreshOnlyIfNewer;
-	}
-
-	public void setSpecifiedRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer) {
-		this.getCacheAnnotation().setRefreshOnlyIfNewer(refreshOnlyIfNewer);
-		this.setSpecifiedRefreshOnlyIfNewer_(refreshOnlyIfNewer);
-
-		if (refreshOnlyIfNewer != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedRefreshOnlyIfNewer_(Boolean refreshOnlyIfNewer) {
-		Boolean old = this.specifiedRefreshOnlyIfNewer;
-		this.specifiedRefreshOnlyIfNewer = refreshOnlyIfNewer;
-		this.firePropertyChanged(SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY, old, refreshOnlyIfNewer);
-	}
-
-	public boolean isDefaultRefreshOnlyIfNewer() {
-		return DEFAULT_REFRESH_ONLY_IF_NEWER;
-	}
-
-
-	// ********** disable hits **********
-
-	public boolean isDisableHits() {
-		return (this.specifiedDisableHits != null) ? this.specifiedDisableHits.booleanValue() : this.isDefaultDisableHits();
-	}
-
-	public Boolean getSpecifiedDisableHits() {
-		return this.specifiedDisableHits;
-	}
-
-	public void setSpecifiedDisableHits(Boolean disableHits) {
-		this.getCacheAnnotation().setDisableHits(disableHits);
-		this.setSpecifiedDisableHits_(disableHits);
-
-		if (disableHits != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedDisableHits_(Boolean disableHits) {
-		Boolean old = this.specifiedDisableHits;
-		this.specifiedDisableHits = disableHits;
-		this.firePropertyChanged(SPECIFIED_DISABLE_HITS_PROPERTY, old, disableHits);
-	}
-
-	public boolean isDefaultDisableHits() {
-		return DEFAULT_DISABLE_HITS;
-	}
-
-
-	// ********** coordination type **********
-
-	public EclipseLinkCacheCoordinationType getCoordinationType() {
-		return (this.specifiedCoordinationType != null) ? this.specifiedCoordinationType : this.getDefaultCoordinationType();
-	}
-
-	public EclipseLinkCacheCoordinationType getSpecifiedCoordinationType() {
-		return this.specifiedCoordinationType;
-	}
-
-	public void setSpecifiedCoordinationType(EclipseLinkCacheCoordinationType type) {
-		this.getCacheAnnotation().setCoordinationType(EclipseLinkCacheCoordinationType.toJavaResourceModel(type));
-		this.setSpecifiedCoordinationType_(type);
-
-		if (type != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedCoordinationType_(EclipseLinkCacheCoordinationType type) {
-		EclipseLinkCacheCoordinationType old = this.specifiedCoordinationType;
-		this.specifiedCoordinationType = type;
-		this.firePropertyChanged(SPECIFIED_COORDINATION_TYPE_PROPERTY, old, type);
-	}
-
-	public EclipseLinkCacheCoordinationType getDefaultCoordinationType() {
-		return DEFAULT_COORDINATION_TYPE;
-	}
-
-
-	// ********** expiry **********
-
-	public Integer getExpiry() {
-		return this.expiry;
-	}
-
-	public void setExpiry(Integer expiry) {
-		this.getCacheAnnotation().setExpiry(expiry);
-		this.setExpiry_(expiry);
-
-		if (expiry != null) {
-			this.removeExpiryTimeOfDayIfNecessary();
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setExpiry_(Integer expiry) {
-		Integer old = this.expiry;
-		this.expiry = expiry;
-		this.firePropertyChanged(EXPIRY_PROPERTY, old, expiry);
-	}
-
-
-	// ********** expiry time of day **********
-
-	public EclipseLinkTimeOfDay getExpiryTimeOfDay() {
-		return this.expiryTimeOfDay;
-	}
-
-	public EclipseLinkTimeOfDay addExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay != null) {
-			throw new IllegalStateException("expiry time of day already exists: " + this.expiryTimeOfDay); //$NON-NLS-1$
-		}
-		EclipseLinkTimeOfDayAnnotation timeOfDayAnnotation = this.getCacheAnnotation().addExpiryTimeOfDay();
-		EclipseLinkJavaTimeOfDay timeOfDay = this.buildExpiryTimeOfDay(timeOfDayAnnotation);
-		this.setExpiryTimeOfDay(timeOfDay);
-
-		this.setExpiry(null);
-		this.setSpecifiedShared(null);
-
-		return timeOfDay;
-	}
-
-	public void removeExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay == null) {
-			throw new IllegalStateException("expiry time of day does not exist"); //$NON-NLS-1$
-		}
-		this.removeExpiryTimeOfDay_();
-	}
-
-	protected void removeExpiryTimeOfDayIfNecessary() {
-		if (this.expiryTimeOfDay != null) {
-			this.removeExpiryTimeOfDay_();
-		}
-	}
-
-	protected void removeExpiryTimeOfDay_() {
-		this.getCacheAnnotation().removeExpiryTimeOfDay();
-		this.setExpiryTimeOfDay(null);
-	}
-
-	public void setExpiryTimeOfDay(EclipseLinkJavaTimeOfDay timeOfDay) {
-		EclipseLinkJavaTimeOfDay old = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = timeOfDay;
-		this.firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, old, timeOfDay);
-	}
-
-	protected void syncExpiryTimeOfDay(EclipseLinkTimeOfDayAnnotation timeOfDayAnnotation) {
-		if (timeOfDayAnnotation == null) {
-			if (this.expiryTimeOfDay != null) {
-				this.setExpiryTimeOfDay(null);
-			}
-		} else {
-			if ((this.expiryTimeOfDay != null) && (this.expiryTimeOfDay.getTimeOfDayAnnotation() == timeOfDayAnnotation)) {
-				this.expiryTimeOfDay.synchronizeWithResourceModel();
-			} else {
-				this.setExpiryTimeOfDay(this.buildExpiryTimeOfDay(timeOfDayAnnotation));
-			}
-		}
-	}
-
-	protected EclipseLinkJavaTimeOfDay buildExpiryTimeOfDay(EclipseLinkTimeOfDayAnnotation timeOfDayAnnotation) {
-		return (timeOfDayAnnotation == null) ? null : new EclipseLinkJavaTimeOfDay(this, timeOfDayAnnotation);
-	}
-
-
-	// ********** existence checking **********
-
-	public boolean isExistenceChecking() {
-		return this.existenceChecking;
-	}
-
-	public void setExistenceChecking(boolean existenceChecking) {
-		if (existenceChecking != this.existenceChecking) {
-			if (existenceChecking) {
-				this.addExistenceCheckingAnnotation();
-			} else {
-				this.removeExistenceCheckingAnnotation();
-				this.setSpecifiedExistenceType(null);
-			}
-			this.setExistenceChecking_(existenceChecking);
-		}
-	}
-
-	protected void setExistenceChecking_(boolean existenceChecking) {
-		boolean old = this.existenceChecking;
-		this.existenceChecking = existenceChecking;
-		this.firePropertyChanged(EXISTENCE_CHECKING_PROPERTY, old, existenceChecking);
-	}
-
-
-	// ********** existence type **********
-
-	public EclipseLinkExistenceType getExistenceType() {
-		return (this.specifiedExistenceType != null) ? this.specifiedExistenceType : this.defaultExistenceType;
-	}
-
-	public EclipseLinkExistenceType getSpecifiedExistenceType() {
-		return this.specifiedExistenceType;
-	}
-
-	public void setSpecifiedExistenceType(EclipseLinkExistenceType type) {
-		if (this.valuesAreDifferent(type, this.specifiedExistenceType)) {
-			if (type != null) {
-				this.setExistenceChecking(true);
-			}
-			this.getExistenceCheckingAnnotation().setValue(EclipseLinkExistenceType.toJavaResourceModel(type));
-			this.setSpecifiedExistenceType_(type);
-		}
-	}
-
-	protected void setSpecifiedExistenceType_(EclipseLinkExistenceType type) {
-		EclipseLinkExistenceType old = this.specifiedExistenceType;
-		this.specifiedExistenceType = type;
-		this.firePropertyChanged(SPECIFIED_EXISTENCE_TYPE_PROPERTY, old, type);
-	}
-
-	protected EclipseLinkExistenceType buildSpecifiedExistenceType(EclipseLinkExistenceCheckingAnnotation ecAnnotation) {
-		return (ecAnnotation == null) ? null : EclipseLinkExistenceType.fromJavaResourceModel(ecAnnotation.getValue());
-	}
-
-	public EclipseLinkExistenceType getDefaultExistenceType() {
-		return this.defaultExistenceType;
-	}
-
-	protected void setDefaultExistenceType(EclipseLinkExistenceType type) {
-		EclipseLinkExistenceType old = this.defaultExistenceType;
-		this.defaultExistenceType = type;
-		this.firePropertyChanged(DEFAULT_EXISTENCE_TYPE_PROPERTY, old, type);
-	}
-
-	protected EclipseLinkExistenceType buildDefaultExistenceType() {
-		return this.existenceChecking ? EclipseLinkExistenceType.CHECK_CACHE : DEFAULT_EXISTENCE_TYPE;
-	}
-
-
-	// ********** cacheable **********
-
-	public JavaCacheable2_0 getCacheable() {
-		return this.cacheable;
-	}
-
-	public boolean calculateDefaultCacheable() {
-		CacheableHolder2_0 superCacheableHolder = this.getCacheableSuperPersistentType(this.getPersistentType());
-		return (superCacheableHolder != null) ?
-				superCacheableHolder.getCacheable().isCacheable() :
-				((PersistenceUnit2_0) this.getPersistenceUnit()).calculateDefaultCacheable();
-	}
-
-	protected CacheableHolder2_0 getCacheableSuperPersistentType(PersistentType persistentType) {
-		PersistentType superPersistentType = persistentType.getSuperPersistentType();
-		if (superPersistentType == null) {
-			return null;
-		}
-		TypeMapping superMapping = superPersistentType.getMapping();
-		return (superMapping instanceof CacheableHolder2_0) ?
-				(CacheableHolder2_0) superMapping :
-				this.getCacheableSuperPersistentType(superPersistentType);  // recurse
-	}
-
-	protected JavaCacheable2_0 buildCacheable() {
-		return this.isJpa2_0Compatible() ?
-				this.getJpaFactory2_0().buildJavaCacheable(this) :
-				new NullJavaCacheable2_0(this);
-	}
-
-
-	// ********** cache annotation **********
-
-	protected EclipseLinkCacheAnnotation getCacheAnnotation() {
-		return (EclipseLinkCacheAnnotation) this.getJavaResourceType().getNonNullAnnotation(this.getCacheAnnotationName());
-	}
-
-	protected String getCacheAnnotationName() {
-		return EclipseLinkCacheAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** existence checking annotation **********
-
-	protected EclipseLinkExistenceCheckingAnnotation getExistenceCheckingAnnotation() {
-		return (EclipseLinkExistenceCheckingAnnotation) this.getJavaResourceType().getAnnotation(this.getExistenceCheckingAnnotationName());
-	}
-
-	protected EclipseLinkExistenceCheckingAnnotation addExistenceCheckingAnnotation() {
-		return (EclipseLinkExistenceCheckingAnnotation) this.getJavaResourceType().addAnnotation(this.getExistenceCheckingAnnotationName());
-	}
-
-	protected void removeExistenceCheckingAnnotation() {
-		this.getJavaResourceType().removeAnnotation(this.getExistenceCheckingAnnotationName());
-	}
-
-	protected String getExistenceCheckingAnnotationName() {
-		return EclipseLinkExistenceCheckingAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaEclipseLinkNonEmbeddableTypeMapping getParent() {
-		return (JavaEclipseLinkNonEmbeddableTypeMapping) super.getParent();
-	}
-
-	protected JavaEclipseLinkNonEmbeddableTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected JavaPersistentType getPersistentType() {
-		return this.getTypeMapping().getPersistentType();
-	}
-
-	public JavaResourceType getJavaResourceType() {
-		return this.getTypeMapping().getJavaResourceType();
-	}
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.validateExpiry(messages, astRoot);
-	}
-	
-	protected void validateExpiry(List<IMessage> messages, CompilationUnit astRoot) {
-		if ((this.expiry != null) && (this.expiryTimeOfDay != null)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.CACHE_EXPIRY_AND_EXPIRY_TIME_OF_DAY_BOTH_SPECIFIED,
-					new String[] {this.getPersistentType().getName()},
-					this,
-					this.getValidationTextRange(astRoot)
-				)
-			);
-		}
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getCacheAnnotation().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java
deleted file mode 100644
index b391bc8ddf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkChangeTracking.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTrackingType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkChangeTrackingAnnotation;
-
-public class JavaEclipseLinkChangeTracking
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkChangeTracking
-{
-	protected EclipseLinkChangeTrackingType specifiedType;
-
-
-	public JavaEclipseLinkChangeTracking(JavaTypeMapping parent) {
-		super(parent);
-		this.specifiedType = this.buildSpecifiedType();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedType_(this.buildSpecifiedType());
-	}
-
-
-	// ********** type **********  
-
-	public EclipseLinkChangeTrackingType getType() {
-		return (this.specifiedType != null) ? this.specifiedType : this.getDefaultType();
-	}
-
-	public EclipseLinkChangeTrackingType getSpecifiedType() {
-		return this.specifiedType;
-	}
-
-	public void setSpecifiedType(EclipseLinkChangeTrackingType type) {
-		if (this.valuesAreDifferent(type, this.specifiedType)) {
-			EclipseLinkChangeTrackingAnnotation annotation = this.getChangeTrackingAnnotation();
-			if (type == null) {
-				if (annotation != null) {
-					this.removeChangeTrackingAnnotation();
-				}
-			} else {
-				if (annotation == null) {
-					annotation = this.addChangeTrackingAnnotation();
-				}
-				annotation.setValue(EclipseLinkChangeTrackingType.toJavaResourceModel(type));
-			}
-			this.setSpecifiedType_(type);
-		}
-	}
-
-	protected void setSpecifiedType_(EclipseLinkChangeTrackingType type) {
-		EclipseLinkChangeTrackingType old = this.specifiedType;
-		this.specifiedType = type;
-		this.firePropertyChanged(SPECIFIED_TYPE_PROPERTY, old, type);
-	}
-
-	protected EclipseLinkChangeTrackingType buildSpecifiedType() {
-		EclipseLinkChangeTrackingAnnotation annotation = this.getChangeTrackingAnnotation();
-		if (annotation == null) {
-			return null;
-		}
-		ChangeTrackingType value = annotation.getValue();
-		return (value == null) ? DEFAULT_TYPE : EclipseLinkChangeTrackingType.fromJavaResourceModel(value);
-	}
-
-	public EclipseLinkChangeTrackingType getDefaultType() {
-		return DEFAULT_TYPE;
-	}
-
-
-	// ********** change tracking annotation **********  
-
-	protected EclipseLinkChangeTrackingAnnotation getChangeTrackingAnnotation() {
-		return (EclipseLinkChangeTrackingAnnotation) this.getJavaResourceType().getAnnotation(this.getChangeTrackingAnnotationName());
-	}
-
-	protected EclipseLinkChangeTrackingAnnotation addChangeTrackingAnnotation() {
-		return (EclipseLinkChangeTrackingAnnotation) this.getJavaResourceType().addAnnotation(this.getChangeTrackingAnnotationName());
-	}
-
-	protected void removeChangeTrackingAnnotation() {
-		this.getJavaResourceType().removeAnnotation(this.getChangeTrackingAnnotationName());
-	}
-
-	protected String getChangeTrackingAnnotationName() {
-		return EclipseLinkChangeTrackingAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** misc **********  
-
-	@Override
-	public JavaTypeMapping getParent() {
-		return (JavaTypeMapping) super.getParent();
-	}
-
-	protected JavaTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected JavaPersistentType getPersistentType() {
-		return this.getTypeMapping().getPersistentType();
-	}
-
-	protected JavaResourceType getJavaResourceType() {
-		return this.getPersistentType().getJavaResourceType();
-	}
-
-
-	// ********** validation **********  
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getAnnotationTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot);
-	}
-
-	protected TextRange getAnnotationTextRange(CompilationUnit astRoot) {
-		EclipseLinkChangeTrackingAnnotation annotation = this.getChangeTrackingAnnotation();
-		return (annotation == null) ? null : annotation.getTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java
deleted file mode 100644
index cec7789ce0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConversionValue.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConversionValue;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConversionValueAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkConversionValue
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkConversionValue
-{
-	private final EclipseLinkConversionValueAnnotation conversionValueAnnotation;
-
-	private String dataValue;
-
-	private String objectValue;
-
-
-	public JavaEclipseLinkConversionValue(JavaEclipseLinkObjectTypeConverter parent, EclipseLinkConversionValueAnnotation conversionValueAnnotation) {
-		super(parent);
-		this.conversionValueAnnotation = conversionValueAnnotation;
-		this.dataValue = conversionValueAnnotation.getDataValue();
-		this.objectValue = conversionValueAnnotation.getObjectValue();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setDataValue_(this.conversionValueAnnotation.getDataValue());
-		this.setObjectValue_(this.conversionValueAnnotation.getObjectValue());
-	}
-
-
-	// ********** data value **********
-
-	public String getDataValue() {
-		return this.dataValue;
-	}
-
-	public void setDataValue(String value) {
-		this.conversionValueAnnotation.setDataValue(value);
-		this.setDataValue_(value);
-	}
-
-	protected void setDataValue_(String value) {
-		String old = this.dataValue;
-		this.dataValue = value;
-		this.firePropertyChanged(DATA_VALUE_PROPERTY, old, value);
-	}
-
-
-	// ********** object value **********
-
-	public String getObjectValue() {
-		return this.objectValue;
-	}
-
-	public void setObjectValue(String value) {
-		this.conversionValueAnnotation.setObjectValue(value);
-		this.setObjectValue_(value);
-	}
-
-	protected void setObjectValue_(String value) {
-		String old = this.objectValue;
-		this.objectValue = value;
-		this.firePropertyChanged(OBJECT_VALUE_PROPERTY, old, value);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaEclipseLinkObjectTypeConverter getParent() {
-		return (JavaEclipseLinkObjectTypeConverter) super.getParent();
-	}
-
-	protected JavaEclipseLinkObjectTypeConverter getObjectTypeConverter() {
-		return this.getParent();
-	}
-
-	public EclipseLinkConversionValueAnnotation getConversionValueAnnotation() {
-		return this.conversionValueAnnotation;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-	}
-
-	public TextRange getDataValueTextRange(CompilationUnit astRoot) {
-		return this.getValidationTextRange(this.conversionValueAnnotation.getDataValueTextRange(astRoot), astRoot);
-	}
-
-	protected TextRange getObjectValueTextRange(CompilationUnit astRoot) {
-		return this.getValidationTextRange(this.conversionValueAnnotation.getObjectValueTextRange(astRoot), astRoot);
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.conversionValueAnnotation.getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getObjectTypeConverter().getValidationTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java
deleted file mode 100644
index bc695a9867..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConvert.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.utility.Filter;
-import org.eclipse.jpt.common.utility.internal.Association;
-import org.eclipse.jpt.common.utility.internal.SimpleAssociation;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.context.Converter;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaConverter;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.AbstractJavaConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkConvertValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConvertAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-
-public class JavaEclipseLinkConvert
-	extends AbstractJavaConverter
-	implements EclipseLinkConvert
-{
-	private final EclipseLinkConvertAnnotation convertAnnotation;
-
-	private String specifiedConverterName;
-	private String defaultConverterName;
-
-	private JavaEclipseLinkConverter<?> converter;
-
-
-	protected static final JavaEclipseLinkConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new JavaEclipseLinkConverter.Adapter[] {
-		JavaEclipseLinkCustomConverter.Adapter.instance(),
-		JavaEclipseLinkTypeConverter.Adapter.instance(),
-		JavaEclipseLinkObjectTypeConverter.Adapter.instance(),
-		JavaEclipseLinkStructConverter.Adapter.instance()
-	};
-	protected static final Iterable<JavaEclipseLinkConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<JavaEclipseLinkConverter.Adapter>(CONVERTER_ADAPTER_ARRAY);
-                                                                                                                      
-
-	public JavaEclipseLinkConvert(JavaAttributeMapping parent, EclipseLinkConvertAnnotation convertAnnotation, JavaConverter.Owner owner) {
-		super(parent, owner);
-		this.convertAnnotation = convertAnnotation;
-		this.specifiedConverterName = convertAnnotation.getValue();
-		this.converter = this.buildConverter();
-	}
-
-	public EclipseLinkConvertAnnotation getConverterAnnotation() {
-		return this.convertAnnotation;
-	}
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedConverterName_(this.convertAnnotation.getValue());
-		this.syncConverter();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDefaultConverterName(this.buildDefaultConverterName());
-		if (this.converter != null) {
-			this.converter.update();
-		}
-	}
-
-
-	// ********** converter name **********
-
-	public String getConverterName() {
-		return (this.specifiedConverterName != null) ? this.specifiedConverterName : this.defaultConverterName;
-	}
-
-	public String getSpecifiedConverterName() {
-		return this.specifiedConverterName;
-	}
-
-	public void setSpecifiedConverterName(String name) {
-		this.convertAnnotation.setValue(name);
-		this.setSpecifiedConverterName_(name);
-	}
-
-	protected void setSpecifiedConverterName_(String name) {
-		String old = this.specifiedConverterName;
-		this.specifiedConverterName = name;
-		this.firePropertyChanged(SPECIFIED_CONVERTER_NAME_PROPERTY, old, name);
-	}
-
-	public String getDefaultConverterName() {
-		return this.defaultConverterName;
-	}
-
-	protected void setDefaultConverterName(String name) {
-		String old = this.defaultConverterName;
-		this.defaultConverterName = name;
-		this.firePropertyChanged(DEFAULT_CONVERTER_NAME_PROPERTY, old, name);
-	}
-
-	protected String buildDefaultConverterName() {
-		return DEFAULT_CONVERTER_NAME;
-	}
-
-
-	// ********** converter **********
-
-	public JavaEclipseLinkConverter<?> getConverter() {
-		return this.converter;
-	}
-
-	public void setConverter(Class<? extends EclipseLinkConverter> converterType) {
-		if (converterType == null) {
-			if (this.converter != null) {
-				this.setConverter_(null);
-				this.retainConverterAnnotation(null);
-			}
-		} else {
-			if ((this.converter == null) || (this.converter.getType() != converterType)) {
-				JavaEclipseLinkConverter.Adapter converterAdapter = this.getConverterAdapter(converterType);
-				this.retainConverterAnnotation(converterAdapter);
-				this.setConverter_(converterAdapter.buildNewConverter(this.getResourceAttribute(), this));
-			}
-		}
-	}
-
-	protected void setConverter_(JavaEclipseLinkConverter<?> converter) {
-		JavaEclipseLinkConverter<?> old = this.converter;
-		this.converter = converter;
-		this.firePropertyChanged(CONVERTER_PROPERTY, old, converter);
-	}
-
-	protected JavaEclipseLinkConverter<?> buildConverter() {
-		return this.isVirtual() ? null : this.buildConverter_();
-	}
-
-	protected JavaEclipseLinkConverter<?> buildConverter_() {
-		JavaResourceAttribute resourceAttribute = this.getResourceAttribute();
-		for (JavaEclipseLinkConverter.Adapter adapter : this.getConverterAdapters()) {
-			JavaEclipseLinkConverter<?> javaConverter = adapter.buildConverter(resourceAttribute, this);
-			if (javaConverter != null) {
-				return javaConverter;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Clear all the converter annotations <em>except</em> for the annotation
-	 * corresponding to the specified adapter. If the specified adapter is
-	 * <code>null</code>, remove <em>all</em> the converter annotations.
-	 */
-	protected void retainConverterAnnotation(JavaEclipseLinkConverter.Adapter converterAdapter) {
-		JavaResourceAttribute resourceAttribute = this.getResourceAttribute();
-		for (JavaEclipseLinkConverter.Adapter adapter : this.getConverterAdapters()) {
-			if (adapter != converterAdapter) {
-				adapter.removeConverterAnnotation(resourceAttribute);
-			}
-		}
-	}
-
-	protected void syncConverter() {
-		if ( ! this.isVirtual()) {
-			this.syncConverter_();
-		}
-	}
-
-	protected void syncConverter_() {
-		Association<JavaEclipseLinkConverter.Adapter, EclipseLinkNamedConverterAnnotation> assoc = this.getEclipseLinkConverterAnnotation();
-		if (assoc == null) {
-			if (this.converter != null) {
-				this.setConverter_(null);
-			}
-		} else {
-			JavaEclipseLinkConverter.Adapter adapter = assoc.getKey();
-			EclipseLinkNamedConverterAnnotation annotation = assoc.getValue();
-			if ((this.converter != null) &&
-					(this.converter.getType() == adapter.getConverterType()) &&
-					(this.converter.getConverterAnnotation() == annotation)) {
-				this.converter.synchronizeWithResourceModel();
-			} else {
-				this.setConverter_(adapter.buildConverter(annotation, this));
-			}
-		}
-	}
-
-	/**
-	 * Return the first EclipseLink converter annotation we find along with its
-	 * corresponding adapter. Return <code>null</code> if there are no
-	 * converter annotations.
-	 */
-	protected Association<JavaEclipseLinkConverter.Adapter, EclipseLinkNamedConverterAnnotation> getEclipseLinkConverterAnnotation() {
-		JavaResourceAttribute resourceAttribute = this.getResourceAttribute();
-		for (JavaEclipseLinkConverter.Adapter adapter : this.getConverterAdapters()) {
-			EclipseLinkNamedConverterAnnotation annotation = adapter.getConverterAnnotation(resourceAttribute);
-			if (annotation != null) {
-				return new SimpleAssociation<JavaEclipseLinkConverter.Adapter, EclipseLinkNamedConverterAnnotation>(adapter, annotation);
-			}
-		}
-		return null;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * Return the converter adapter for the specified converter type.
-	 */
-	protected JavaEclipseLinkConverter.Adapter getConverterAdapter(Class<? extends EclipseLinkConverter> converterType) {
-		for (JavaEclipseLinkConverter.Adapter adapter : this.getConverterAdapters()) {
-			if (adapter.getConverterType() == converterType) {
-				return adapter;
-			}
-		}
-		throw new IllegalArgumentException("unknown converter type: " + converterType.getName()); //$NON-NLS-1$
-	}
-
-	protected Iterable<JavaEclipseLinkConverter.Adapter> getConverterAdapters() {
-		return CONVERTER_ADAPTERS;
-	}
-
-
-	// ********** misc **********
-
-	public Class<? extends Converter> getType() {
-		return EclipseLinkConvert.class;
-	}
-
-	/**
-	 * Return whether the convert is <em>virtual</em> and, as a result, does
-	 * not have a converter.
-	 */
-	protected boolean isVirtual() {
-		return this.getAttributeMapping().getPersistentAttribute().isVirtual();
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		this.setConverter(null);
-	}
-
-
-	// ********** Java completion proposals **********
-
-	@Override
-	public Iterable<String> getJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
-		Iterable<String> result = super.getJavaCompletionProposals(pos, filter, astRoot);
-		if (result != null) {
-			return result;
-		}
-		if (this.convertValueTouches(pos, astRoot)) {
-			result = this.getJavaCandidateConverterNames(filter);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	protected boolean convertValueTouches(int pos, CompilationUnit astRoot) {
-		return this.convertAnnotation.valueTouches(pos, astRoot);
-	}
-
-	protected Iterable<String> getJavaCandidateConverterNames(Filter<String> filter) {
-		return StringTools.convertToJavaStringLiterals(this.getCandidateConverterNames(filter));
-	}
-
-	protected Iterable<String> getCandidateConverterNames(Filter<String> filter) {
-		return new FilteringIterable<String>(this.getConverterNames(), filter);
-	}
-
-	protected Iterable<String> getConverterNames() {
-		return this.getPersistenceUnit().getUniqueConverterNames();
-	}
-
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends JavaConverter.AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<? extends Converter> getConverterType() {
-			return EclipseLinkConvert.class;
-		}
-
-		@Override
-		protected String getAnnotationName() {
-			return EclipseLinkConvertAnnotation.ANNOTATION_NAME;
-		}
-
-		public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) {
-			return new JavaEclipseLinkConvert(parent, (EclipseLinkConvertAnnotation) converterAnnotation, this.buildOwner());
-		}
-		
-		@Override
-		protected Owner buildOwner() {
-			return new Owner() {
-				public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) {
-					return new EclipseLinkConvertValidator((EclipseLinkConvert) converter, textRangeResolver);
-				}
-			};
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java
deleted file mode 100644
index 684640f8ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverter.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMember;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.common.utility.internal.ClassName;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public abstract class JavaEclipseLinkConverter<A extends EclipseLinkNamedConverterAnnotation>
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkConverter
-{
-	protected final A converterAnnotation;
-
-	protected String name;
-
-
-	protected JavaEclipseLinkConverter(JavaJpaContextNode parent, A converterAnnotation) {
-		super(parent);
-		this.converterAnnotation = converterAnnotation;
-		this.name = converterAnnotation.getName();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setName_(this.converterAnnotation.getName());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-	}
-
-
-	// ********** name **********
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String name) {
-		this.converterAnnotation.setName(name);
-		this.setName_(name);
-	}
-
-	protected void setName_(String name) {
-		String old = this.name;
-		this.name = name;
-		this.firePropertyChanged(NAME_PROPERTY, old, name);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaJpaContextNode getParent() {
-		return (JavaJpaContextNode) super.getParent();
-	}
-
-	public A getConverterAnnotation() {
-		return this.converterAnnotation;
-	}
-
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-
-	public char getEnclosingTypeSeparator() {
-		return '.';
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.name);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.validateName(messages, astRoot);
-	}
-
-	protected void validateName(List<IMessage> messages, CompilationUnit astRoot) {
-		if (StringTools.stringIsEmpty(this.name)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY, 
-					EclipseLinkJpaValidationMessages.CONVERTER_NAME_UNDEFINED, 
-					EMPTY_STRING_ARRAY,
-					this,
-					this.getNameTextRange(astRoot)
-				)
-			);
-			return;
-		}
-
-		if (ArrayTools.contains(EclipseLinkConvert.RESERVED_CONVERTER_NAMES, this.name)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.RESERVED_CONVERTER_NAME,
-					EMPTY_STRING_ARRAY,
-					this,
-					this.getNameTextRange(astRoot)
-				)
-			);
-		}
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.converterAnnotation.getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot);
-	}
-	
-	public TextRange getNameTextRange(CompilationUnit astRoot){
-		return this.getValidationTextRange(this.getConverterAnnotation().getNameTextRange(astRoot), astRoot);
-	}
-	
-
-	// ********** adapter **********
-
-	/**
-	 * This interface allows a client to interact with various
-	 * EclipseLink Java converters via the same protocol.
-	 */
-	public interface Adapter
-	{
-		/**
-		 * Return the type of converter handled by the adapter.
-		 */
-		Class<? extends EclipseLinkConverter> getConverterType();
-
-		/**
-		 * Build a converter corresponding to the specified Java resource
-		 * persistent member if the member is modified by the adapter's
-		 * converter annotation. Return <code>null</code> otherwise.
-		 * This is used to build a converter during construction of the
-		 * converter's parent.
-		 */
-		JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildConverter(JavaResourceMember javaResourceMember, JavaJpaContextNode parent);
-
-		/**
-		 * Return the adapter's converter annotation for the specified Java
-		 * resource persistent member.
-		 * Return <code>null</code> if the adapter's converter annotation is
-		 * missing. 
-		 * The returned converter annotation is compared to the parent's
-		 * converter's converter annotation while the context model is synchronized
-		 * with the resource model. If it has changed, the parent will build
-		 * a new converter (via the adapter).
-		 * 
-		 * @see #buildConverter(EclipseLinkNamedConverterAnnotation, JavaJpaContextNode)
-		 */
-		EclipseLinkNamedConverterAnnotation getConverterAnnotation(JavaResourceMember javaResourceMember);
-
-		/**
-		 * Build a converter using the specified converter annotation.
-		 * This is used when the context model is synchronized with the
-		 * resource model (and the resource model has changed).
-		 * 
-		 * @see #getConverterAnnotation(JavaResourcePersistentMember)
-		 */
-		JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildConverter(EclipseLinkNamedConverterAnnotation converterAnnotation, JavaJpaContextNode parent);
-
-		/**
-		 * Build a new converter and, if necessary, its corresponding converter
-		 * annotation.
-		 */
-		JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildNewConverter(JavaResourceMember javaResourceMember, JavaJpaContextNode parent);
-
-		/**
-		 * Remove the adapter's converter annotation from the specified
-		 * Java resource persistent member.
-		 */
-		void removeConverterAnnotation(JavaResourceMember javaResourceMember);
-	}
-
-
-	// ********** abstract adapter **********
-
-	public abstract static class AbstractAdapter
-		implements JavaEclipseLinkConverter.Adapter
-	{
-		public JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildConverter(JavaResourceMember member, JavaJpaContextNode parent) {
-			EclipseLinkNamedConverterAnnotation annotation = this.getConverterAnnotation(member);
-			return (annotation == null) ? null : this.buildConverter(annotation, parent);
-		}
-
-		public EclipseLinkNamedConverterAnnotation getConverterAnnotation(JavaResourceMember member) {
-			return (EclipseLinkNamedConverterAnnotation) member.getAnnotation(this.getAnnotationName());
-		}
-
-		protected abstract String getAnnotationName();
-
-		public JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildNewConverter(JavaResourceMember member, JavaJpaContextNode parent) {
-			return this.buildConverter(this.buildConverterAnnotationIfNecessary(member), parent);
-		}
-
-		protected EclipseLinkNamedConverterAnnotation buildConverterAnnotationIfNecessary(JavaResourceMember member) {
-			// the annotation may already be present, after we remove the other converter annotations
-			EclipseLinkNamedConverterAnnotation annotation = this.getConverterAnnotation(member);
-			return (annotation != null) ? annotation : this.buildConverterAnnotation(member);
-		}
-
-		protected EclipseLinkNamedConverterAnnotation buildConverterAnnotation(JavaResourceMember member) {
-			return (EclipseLinkNamedConverterAnnotation) member.addAnnotation(this.getAnnotationName());
-		}
-
-		public void removeConverterAnnotation(JavaResourceMember member) {
-			member.removeAnnotation(this.getAnnotationName());
-		}
-
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this, ClassName.getSimpleName(this.getAnnotationName()));
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterClassConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterClassConverter.java
deleted file mode 100644
index cd24dcb264..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterClassConverter.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.JDTTools;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterClassConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * <code>
- * <ul>
- * <li>org.eclipse.persistence.annotations.Converter
- * <li>org.eclipse.persistence.annotations.StructConverter
- * </ul>
- * </code>
- */
-public abstract class JavaEclipseLinkConverterClassConverter<A extends EclipseLinkNamedConverterAnnotation>
-	extends JavaEclipseLinkConverter<A>
-	implements EclipseLinkConverterClassConverter
-{
-	private String converterClass;
-
-
-	public JavaEclipseLinkConverterClassConverter(JavaJpaContextNode parent, A converterAnnotation, String converterClass) {
-		super(parent, converterAnnotation);
-		this.converterClass = converterClass;
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setConverterClass_(this.getAnnotationConverterClass());
-	}
-
-
-	// ********** converter class **********
-
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-
-	public void setConverterClass(String converterClass) {
-		this.setAnnotationConverterClass(converterClass);
-		this.setConverterClass_(converterClass);
-	}
-
-	protected void setConverterClass_(String converterClass) {
-		String old = this.converterClass;
-		this.converterClass = converterClass;
-		this.firePropertyChanged(CONVERTER_CLASS_PROPERTY, old, converterClass);
-	}
-
-	protected abstract String getAnnotationConverterClass();
-
-	protected abstract void setAnnotationConverterClass(String converterClass);
-
-
-	//************ validation ***************
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.validateConverterClass(messages, astRoot);
-	}
-
-	protected void validateConverterClass(List<IMessage> messages, CompilationUnit astRoot) {
-		if (this.converterClass == null) {
-			// the annotation will have a compile error if its converter class is missing
-			return;
-		}
-
-		if (StringTools.stringIsEmpty(this.converterClass)) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.CONVERTER_CLASS_DEFINED,
-					this,
-					this.getConverterClassTextRange(astRoot)
-				)
-			);
-			return;
-		}
-
-		if ( ! this.converterClassExists()) {
-			this.addConverterClassDoesNotExistMessageTo(messages, astRoot);
-			return;
-		}
-
-		if ( ! this.converterClassImplementsInterface(this.getEclipseLinkConverterInterface())) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					this.getEclipseLinkConverterInterfaceErrorMessage(),
-					new String[] {this.getFullyQualifiedConverterClass()},
-					this,
-					this.getConverterClassTextRange(astRoot)
-				)
-			);
-		}
-	}
-
-	protected void addConverterClassDoesNotExistMessageTo(List<IMessage> messages, CompilationUnit astRoot) {
-		messages.add(
-			DefaultEclipseLinkJpaValidationMessages.buildMessage(
-				IMessage.HIGH_SEVERITY,
-				EclipseLinkJpaValidationMessages.CONVERTER_CLASS_EXISTS,
-				new String[] {this.getFullyQualifiedConverterClass()},
-				this,
-				this.getConverterClassTextRange(astRoot)
-			)
-		);
-	}
-
-	/**
-	 * Return the name of the EclipseLink interface the converter class must
-	 * implement.
-	 */
-	protected abstract String getEclipseLinkConverterInterface();
-
-	protected abstract String getEclipseLinkConverterInterfaceErrorMessage();
-
-	protected boolean converterClassExists() {
-		return this.typeExists(this.getFullyQualifiedConverterClass());
-	}
-
-	/**
-	 * Add <code>null</code> check.
-	 */
-	protected boolean typeExists(String typeName) {
-		return (typeName != null) && 
-				(JDTTools.findType(this.getJavaProject(), typeName) != null);
-	}
-
-	/**
-	 * Add <code>null</code> check.
-	 */
-	protected boolean typeImplementsInterface(String typeName, String interfaceName) {
-		return (typeName != null) && 
-				JDTTools.typeIsSubType(this.getJavaProject(), typeName, interfaceName);
-	}
-
-	protected boolean converterClassImplementsInterface(String interfaceName) {
-		return this.typeImplementsInterface(this.getFullyQualifiedConverterClass(), interfaceName);
-	}
-
-	protected abstract String getFullyQualifiedConverterClass();
-
-	protected TextRange getConverterClassTextRange(CompilationUnit astRoot) {
-		return this.getValidationTextRange(this.getAnnotationConverterClassTextRange(astRoot), astRoot);
-	}
-
-	protected abstract TextRange getAnnotationConverterClassTextRange(CompilationUnit astRoot);
-
-	protected IJavaProject getJavaProject() {
-		return this.getJpaProject().getJavaProject();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterContainerImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterContainerImpl.java
deleted file mode 100644
index 3e95f97e80..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkConverterContainerImpl.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.NotNullFilter;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkConverterContainerImpl
-	extends AbstractJavaJpaContextNode
-	implements JavaEclipseLinkConverterContainer
-{
-	protected JavaEclipseLinkCustomConverter customConverter;
-	protected JavaEclipseLinkObjectTypeConverter objectTypeConverter;
-	protected JavaEclipseLinkStructConverter structConverter;
-	protected JavaEclipseLinkTypeConverter typeConverter;
-
-
-	public JavaEclipseLinkConverterContainerImpl(JavaTypeMapping parent) {
-		super(parent);
-		this.customConverter = this.buildCustomConverter();
-		this.objectTypeConverter = this.buildObjectTypeConverter();
-		this.structConverter = this.buildStructConverter();
-		this.typeConverter = this.buildTypeConverter();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.syncCustomConverter();
-		this.syncObjectTypeConverter();
-		this.syncStructConverter();
-		this.syncTypeConverter();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		if (this.customConverter != null) {
-			this.customConverter.update();
-		}
-		if (this.objectTypeConverter != null) {
-			this.objectTypeConverter.update();
-		}
-		if (this.structConverter != null) {
-			this.structConverter.update();
-		}
-		if (this.typeConverter != null) {
-			this.typeConverter.update();
-		}
-	}
-
-
-	// ********** custom converter **********
-
-	public JavaEclipseLinkCustomConverter getCustomConverter() {
-		return this.customConverter;
-	}
-
-	public JavaEclipseLinkCustomConverter addCustomConverter() {
-		if (this.customConverter != null) {
-			throw new IllegalStateException("custom converter already exists: " + this.customConverter); //$NON-NLS-1$
-		}
-		JavaEclipseLinkCustomConverter converter = this.buildNewConverter(this.getCustomConverterAdapter());
-		this.setCustomConverter_(converter);
-		return converter;
-	}
-
-	public void removeCustomConverter() {
-		if (this.customConverter == null) {
-			throw new IllegalStateException("custom converter is null"); //$NON-NLS-1$
-		}
-		this.getCustomConverterAdapter().removeConverterAnnotation(this.getJavaResourceType());
-		this.setCustomConverter_(null);
-	}
-
-	protected void setCustomConverter_(JavaEclipseLinkCustomConverter converter) {
-		JavaEclipseLinkCustomConverter old = this.customConverter;
-		this.customConverter = converter;
-		this.firePropertyChanged(CUSTOM_CONVERTER_PROPERTY, old, converter);
-	}
-
-	protected JavaEclipseLinkCustomConverter buildCustomConverter() {
-		return this.buildConverter(this.getCustomConverterAdapter());
-	}
-
-	protected void syncCustomConverter() {
-		EclipseLinkNamedConverterAnnotation annotation = this.getCustomConverterAdapter().getConverterAnnotation(this.getJavaResourceType());
-		if (annotation == null) {
-			if (this.customConverter != null) {
-				this.setCustomConverter_(null);
-			}
-		} else {
-			if ((this.customConverter != null) && (this.customConverter.getConverterAnnotation() == annotation)) {
-				this.customConverter.synchronizeWithResourceModel();
-			} else {
-				JavaEclipseLinkCustomConverter converter = this.buildConverter(this.getCustomConverterAdapter(), annotation);
-				this.setCustomConverter_(converter);
-			}
-		}
-	}
-
-	protected JavaEclipseLinkCustomConverter.Adapter getCustomConverterAdapter() {
-		return JavaEclipseLinkCustomConverter.Adapter.instance();
-	}
-
-
-	// ********** object type converter **********
-
-	public JavaEclipseLinkObjectTypeConverter getObjectTypeConverter() {
-		return this.objectTypeConverter;
-	}
-
-	public JavaEclipseLinkObjectTypeConverter addObjectTypeConverter() {
-		if (this.objectTypeConverter != null) {
-			throw new IllegalStateException("object type converter already exists: " + this.objectTypeConverter); //$NON-NLS-1$
-		}
-		JavaEclipseLinkObjectTypeConverter converter = this.buildNewConverter(this.getObjectTypeConverterAdapter());
-		this.setObjectTypeConverter_(converter);
-		return converter;
-	}
-
-	public void removeObjectTypeConverter() {
-		if (this.objectTypeConverter == null) {
-			throw new IllegalStateException("object type converter is null"); //$NON-NLS-1$
-		}
-		this.getObjectTypeConverterAdapter().removeConverterAnnotation(this.getJavaResourceType());
-		this.setObjectTypeConverter_(null);
-	}
-
-	protected void setObjectTypeConverter_(JavaEclipseLinkObjectTypeConverter converter) {
-		JavaEclipseLinkObjectTypeConverter old = this.objectTypeConverter;
-		this.objectTypeConverter = converter;
-		this.firePropertyChanged(OBJECT_TYPE_CONVERTER_PROPERTY, old, converter);
-	}
-
-	protected JavaEclipseLinkObjectTypeConverter buildObjectTypeConverter() {
-		return this.buildConverter(this.getObjectTypeConverterAdapter());
-	}
-
-	protected void syncObjectTypeConverter() {
-		EclipseLinkNamedConverterAnnotation annotation = this.getObjectTypeConverterAdapter().getConverterAnnotation(this.getJavaResourceType());
-		if (annotation == null) {
-			if (this.objectTypeConverter != null) {
-				this.setObjectTypeConverter_(null);
-			}
-		} else {
-			if ((this.objectTypeConverter != null) && (this.objectTypeConverter.getConverterAnnotation() == annotation)) {
-				this.objectTypeConverter.synchronizeWithResourceModel();
-			} else {
-				JavaEclipseLinkObjectTypeConverter converter = this.buildConverter(this.getObjectTypeConverterAdapter(), annotation);
-				this.setObjectTypeConverter_(converter);
-			}
-		}
-	}
-
-	protected JavaEclipseLinkObjectTypeConverter.Adapter getObjectTypeConverterAdapter() {
-		return JavaEclipseLinkObjectTypeConverter.Adapter.instance();
-	}
-
-
-	// ********** struct converter **********
-
-	public JavaEclipseLinkStructConverter getStructConverter() {
-		return this.structConverter;
-	}
-
-	public JavaEclipseLinkStructConverter addStructConverter() {
-		if (this.structConverter != null) {
-			throw new IllegalStateException("struct converter already exists: " + this.structConverter); //$NON-NLS-1$
-		}
-		JavaEclipseLinkStructConverter converter = this.buildNewConverter(this.getStructConverterAdapter());
-		this.setStructConverter_(converter);
-		return converter;
-	}
-
-	public void removeStructConverter() {
-		if (this.structConverter == null) {
-			throw new IllegalStateException("struct converter is null"); //$NON-NLS-1$
-		}
-		this.getStructConverterAdapter().removeConverterAnnotation(this.getJavaResourceType());
-		this.setStructConverter_(null);
-	}
-
-	protected void setStructConverter_(JavaEclipseLinkStructConverter converter) {
-		JavaEclipseLinkStructConverter old = this.structConverter;
-		this.structConverter = converter;
-		this.firePropertyChanged(STRUCT_CONVERTER_PROPERTY, old, converter);
-	}
-
-	protected JavaEclipseLinkStructConverter buildStructConverter() {
-		return this.buildConverter(this.getStructConverterAdapter());
-	}
-
-	protected void syncStructConverter() {
-		EclipseLinkNamedConverterAnnotation annotation = this.getStructConverterAdapter().getConverterAnnotation(this.getJavaResourceType());
-		if (annotation == null) {
-			if (this.structConverter != null) {
-				this.setStructConverter_(null);
-			}
-		} else {
-			if ((this.structConverter != null) && (this.structConverter.getConverterAnnotation() == annotation)) {
-				this.structConverter.synchronizeWithResourceModel();
-			} else {
-				JavaEclipseLinkStructConverter converter = this.buildConverter(this.getStructConverterAdapter(), annotation);
-				this.setStructConverter_(converter);
-			}
-		}
-	}
-
-	protected JavaEclipseLinkStructConverter.Adapter getStructConverterAdapter() {
-		return JavaEclipseLinkStructConverter.Adapter.instance();
-	}
-
-
-	// ********** object type converter **********
-
-	public JavaEclipseLinkTypeConverter getTypeConverter() {
-		return this.typeConverter;
-	}
-
-	public JavaEclipseLinkTypeConverter addTypeConverter() {
-		if (this.typeConverter != null) {
-			throw new IllegalStateException("type converter already exists: " + this.typeConverter); //$NON-NLS-1$
-		}
-		JavaEclipseLinkTypeConverter converter = this.buildNewConverter(this.getTypeConverterAdapter());
-		this.setTypeConverter_(converter);
-		return converter;
-	}
-
-	public void removeTypeConverter() {
-		if (this.typeConverter == null) {
-			throw new IllegalStateException("type converter is null"); //$NON-NLS-1$
-		}
-		this.getTypeConverterAdapter().removeConverterAnnotation(this.getJavaResourceType());
-		this.setTypeConverter_(null);
-	}
-
-	protected void setTypeConverter_(JavaEclipseLinkTypeConverter converter) {
-		JavaEclipseLinkTypeConverter old = this.typeConverter;
-		this.typeConverter = converter;
-		this.firePropertyChanged(TYPE_CONVERTER_PROPERTY, old, converter);
-	}
-
-	protected JavaEclipseLinkTypeConverter buildTypeConverter() {
-		return this.buildConverter(this.getTypeConverterAdapter());
-	}
-
-	protected void syncTypeConverter() {
-		EclipseLinkNamedConverterAnnotation annotation = this.getTypeConverterAdapter().getConverterAnnotation(this.getJavaResourceType());
-		if (annotation == null) {
-			if (this.typeConverter != null) {
-				this.setTypeConverter_(null);
-			}
-		} else {
-			if ((this.typeConverter != null) && (this.typeConverter.getConverterAnnotation() == annotation)) {
-				this.typeConverter.synchronizeWithResourceModel();
-			} else {
-				JavaEclipseLinkTypeConverter converter = this.buildConverter(this.getTypeConverterAdapter(), annotation);
-				this.setTypeConverter_(converter);
-			}
-		}
-	}
-
-	protected JavaEclipseLinkTypeConverter.Adapter getTypeConverterAdapter() {
-		return JavaEclipseLinkTypeConverter.Adapter.instance();
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaTypeMapping getParent() {
-		return (JavaTypeMapping) super.getParent();
-	}
-
-	protected JavaTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected JavaResourceType getJavaResourceType() {
-		return this.getTypeMapping().getJavaResourceType();
-	}
-
-	@SuppressWarnings("unchecked")
-	protected <C extends JavaEclipseLinkConverter<?>> C buildConverter(C.Adapter adapter) {
-		return (C) adapter.buildConverter(this.getJavaResourceType(), this);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected <C extends JavaEclipseLinkConverter<?>> C buildConverter(C.Adapter adapter, EclipseLinkNamedConverterAnnotation converterAnnotation) {
-		return (C) adapter.buildConverter(converterAnnotation, this);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected <C extends JavaEclipseLinkConverter<?>> C buildNewConverter(C.Adapter adapter) {
-		return (C) adapter.buildNewConverter(this.getJavaResourceType(), this);
-	}
-
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new FilteringIterable<EclipseLinkConverter>(this.getConverters_(), NotNullFilter.<EclipseLinkConverter>instance());
-	}
-
-	/**
-	 * This will include <code>null</code> converters.
-	 */
-	protected Iterable<EclipseLinkConverter> getConverters_() {
-		ArrayList<EclipseLinkConverter> result = new ArrayList<EclipseLinkConverter>(4);
-		result.add(this.customConverter);
-		result.add(this.objectTypeConverter);
-		result.add(this.structConverter);
-		result.add(this.typeConverter);
-		return result;
-	}
-
-
-	// ********** validation **********
-
-	/**
-	 * The converters are validated in the persistence unit.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit#validateConverters(List, IReporter)
-	 */
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		// converters are validated in the persistence unit
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getJavaResourceType().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomConverter.java
deleted file mode 100644
index 815486ba57..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomConverter.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-
-/**
- * <code>org.eclipse.persistence.annotations.Converter</code>
- */
-public class JavaEclipseLinkCustomConverter
-	extends JavaEclipseLinkConverterClassConverter<EclipseLinkConverterAnnotation>
-	implements EclipseLinkCustomConverter
-{
-	private String fullyQualifiedConverterClass;
-		public static final String FULLY_QUALIFIED_CONVERTER_CLASS_PROPERTY = "fullyQualifiedConverterClass"; //$NON-NLS-1$
-
-
-	public JavaEclipseLinkCustomConverter(JavaJpaContextNode parent, EclipseLinkConverterAnnotation converterAnnotation) {
-		super(parent, converterAnnotation, converterAnnotation.getConverterClass());
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void update() {
-		super.update();
-		this.setFullyQualifiedConverterClass(this.converterAnnotation.getFullyQualifiedConverterClassName());
-	}
-
-
-	// ********** converter class **********
-
-	@Override
-	protected String getAnnotationConverterClass() {
-		return this.converterAnnotation.getConverterClass();
-	}
-
-	@Override
-	protected void setAnnotationConverterClass(String converterClass) {
-		this.converterAnnotation.setConverterClass(converterClass);
-	}
-
-
-	// ********** fully qualified converter class **********
-
-	@Override
-	public String getFullyQualifiedConverterClass() {
-		return this.fullyQualifiedConverterClass;
-	}
-
-	protected void setFullyQualifiedConverterClass(String converterClass) {
-		String old = this.fullyQualifiedConverterClass;
-		this.fullyQualifiedConverterClass = converterClass;
-		this.firePropertyChanged(FULLY_QUALIFIED_CONVERTER_CLASS_PROPERTY, old, converterClass);
-	}
-
-
-	// ********** misc **********
-
-	public Class<EclipseLinkCustomConverter> getType() {
-		return EclipseLinkCustomConverter.class;
-	}
-
-
-	//************ validation ***************
-
-	@Override
-	protected String getEclipseLinkConverterInterface() {
-		return ECLIPSELINK_CONVERTER_CLASS_NAME;
-	}
-
-	@Override
-	protected String getEclipseLinkConverterInterfaceErrorMessage() {
-		return EclipseLinkJpaValidationMessages.CONVERTER_CLASS_IMPLEMENTS_CONVERTER;
-	}
-
-	@Override
-	protected TextRange getAnnotationConverterClassTextRange(CompilationUnit astRoot) {
-		return this.converterAnnotation.getConverterClassTextRange(astRoot);
-	}
-
-	@Override
-	protected void addConverterClassDoesNotExistMessageTo(List<IMessage> messages, CompilationUnit astRoot) {
-		// no need to add message since there will already be a compiler error
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<EclipseLinkCustomConverter> getConverterType() {
-			return EclipseLinkCustomConverter.class;
-		}
-
-		@Override
-		protected String getAnnotationName() {
-			return EclipseLinkConverterAnnotation.ANNOTATION_NAME;
-		}
-
-		public JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildConverter(EclipseLinkNamedConverterAnnotation converterAnnotation, JavaJpaContextNode parent) {
-			return new JavaEclipseLinkCustomConverter(parent, (EclipseLinkConverterAnnotation) converterAnnotation);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java
deleted file mode 100644
index a314cc60c3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkCustomizer.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.JDTTools;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCustomizerAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkCustomizer
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkCustomizer
-{
-	private String specifiedCustomizerClass;
-
-	private String fullyQualifiedCustomizerClass;
-		public static final String FULLY_QUALIFIED_CUSTOMIZER_CLASS_PROPERTY = "fullyQualifiedCustomizerClass"; //$NON-NLS-1$
-
-
-	public JavaEclipseLinkCustomizer(EclipseLinkJavaTypeMapping parent) {
-		super(parent);
-		this.specifiedCustomizerClass = this.buildSpecifiedCustomizerClass();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedCustomizerClass_(this.buildSpecifiedCustomizerClass());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setFullyQualifiedCustomizerClass(this.buildFullyQualifiedCustomizerClass());
-	}
-
-
-	// ********** customizer class **********
-
-	public String getCustomizerClass() {
-		return (this.specifiedCustomizerClass != null) ? this.specifiedCustomizerClass : null;
-	}
-
-	public String getSpecifiedCustomizerClass() {
-		return this.specifiedCustomizerClass;
-	}
-
-	public void setSpecifiedCustomizerClass(String customizerClass) {
-		if (this.valuesAreDifferent(customizerClass, this.specifiedCustomizerClass)) {
-			EclipseLinkCustomizerAnnotation annotation = this.getCustomizerAnnotation();
-			if (customizerClass == null) {
-				if (annotation != null) {
-					this.removeCustomizerAnnotation();
-				}
-			} else {
-				if (annotation == null) {
-					annotation = this.addCustomizerAnnotation();
-				}
-				annotation.setValue(customizerClass);
-			}
-
-			this.setSpecifiedCustomizerClass_(customizerClass);
-		}
-	}
-
-	protected void setSpecifiedCustomizerClass_(String customizerClass) {
-		String old = this.specifiedCustomizerClass;
-		this.specifiedCustomizerClass = customizerClass;
-		this.firePropertyChanged(SPECIFIED_CUSTOMIZER_CLASS_PROPERTY, old, customizerClass);
-	}
-
-	protected String buildSpecifiedCustomizerClass() {
-		EclipseLinkCustomizerAnnotation annotation = this.getCustomizerAnnotation();
-		return (annotation == null) ? null : annotation.getValue();
-	}
-
-	public String getDefaultCustomizerClass() {
-		return null;  // no default for Java
-	}
-
-
-	// ********** fully-qualified customizer class **********
-
-	public String getFullyQualifiedCustomizerClass() {
-		return this.fullyQualifiedCustomizerClass;
-	}
-
-	protected void setFullyQualifiedCustomizerClass(String customizerClass) {
-		String old = this.fullyQualifiedCustomizerClass;
-		this.fullyQualifiedCustomizerClass = customizerClass;
-		this.firePropertyChanged(FULLY_QUALIFIED_CUSTOMIZER_CLASS_PROPERTY, old, customizerClass);
-	}
-
-	protected String buildFullyQualifiedCustomizerClass() {
-		EclipseLinkCustomizerAnnotation annotation = this.getCustomizerAnnotation();
-		return (annotation == null) ? null : annotation.getFullyQualifiedCustomizerClassName();
-	}
-
-
-	// ********** customizer annotation **********
-
-	protected EclipseLinkCustomizerAnnotation getCustomizerAnnotation() {
-		return (EclipseLinkCustomizerAnnotation) this.getJavaResourceType().getAnnotation(this.getCustomizerAnnotationName());
-	}
-
-	protected EclipseLinkCustomizerAnnotation addCustomizerAnnotation() {
-		return (EclipseLinkCustomizerAnnotation) this.getJavaResourceType().addAnnotation(this.getCustomizerAnnotationName());
-	}
-
-	protected void removeCustomizerAnnotation() {
-		this.getJavaResourceType().removeAnnotation(this.getCustomizerAnnotationName());
-	}
-
-	protected String getCustomizerAnnotationName() {
-		return EclipseLinkCustomizerAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public EclipseLinkJavaTypeMapping getParent() {
-		return (EclipseLinkJavaTypeMapping) super.getParent();
-	}
-
-	protected EclipseLinkJavaTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected JavaResourceType getJavaResourceType() {
-		return this.getTypeMapping().getJavaResourceType();
-	}
-
-	public char getCustomizerClassEnclosingTypeSeparator() {
-		return '.';
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.validateCustomizerClass(messages, astRoot);
-	}
-
-	protected void validateCustomizerClass(List<IMessage> messages,CompilationUnit astRoot) {
-		IJavaProject javaProject = getPersistenceUnit().getJpaProject().getJavaProject();
-		EclipseLinkCustomizerAnnotation annotation = this.getCustomizerAnnotation();
-		if (annotation != null && annotation.getValue() != null && 
-				//if the type cannot be resolved there is no need to perform the following validation,
-				//JDT will note the error in the source
-				JDTTools.findType(javaProject, annotation.getValue()) != null) {
-			if (!JDTTools.classHasPublicZeroArgConstructor(javaProject, this.getFullyQualifiedCustomizerClass())) {
-				messages.add(
-						DefaultEclipseLinkJpaValidationMessages.buildMessage(
-								IMessage.HIGH_SEVERITY,
-								EclipseLinkJpaValidationMessages.DESCRIPTOR_CUSTOMIZER_CLASS_NOT_VALID,
-								new String[] {this.getFullyQualifiedCustomizerClass()},
-								this,
-								this.getCustomizerClassTextRange(astRoot)
-						)
-				);
-			} else if (!annotation.customizerClassImplementsInterface(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME, astRoot)) {
-				messages.add(
-						DefaultEclipseLinkJpaValidationMessages.buildMessage(
-								IMessage.HIGH_SEVERITY,
-								EclipseLinkJpaValidationMessages.DESCRIPTOR_CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER,
-								new String[] {this.getFullyQualifiedCustomizerClass()},
-								this,
-								this.getCustomizerClassTextRange(astRoot)
-						)
-				);
-			} 
-		}
-	}
-
-	protected TextRange getCustomizerClassTextRange(CompilationUnit astRoot) {
-		return this.getValidationTextRange(this.getCustomizerAnnotation().getValueTextRange(astRoot), astRoot);
-	}
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getCustomizerAnnotation().getTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddableImpl.java
deleted file mode 100644
index 201072bacf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddableImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.utility.internal.NotNullFilter;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaEmbeddable;
-import org.eclipse.jpt.jpa.core.resource.java.EmbeddableAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkTypeMappingValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * EclipseLink
- * Java embeddable type mapping
- */
-public class JavaEclipseLinkEmbeddableImpl
-	extends AbstractJavaEmbeddable
-	implements JavaEclipseLinkEmbeddable
-{
-	protected final JavaEclipseLinkConverterContainer converterContainer;
-
-	protected final JavaEclipseLinkChangeTracking changeTracking;
-
-	protected final JavaEclipseLinkCustomizer customizer;
-
-
-	public JavaEclipseLinkEmbeddableImpl(JavaPersistentType parent, EmbeddableAnnotation mappingAnnotation) {
-		super(parent, mappingAnnotation);
-		this.converterContainer = this.buildConverterContainer();
-		this.changeTracking = this.buildChangeTracking();
-		this.customizer = this.buildCustomizer();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.converterContainer.synchronizeWithResourceModel();
-		this.changeTracking.synchronizeWithResourceModel();
-		this.customizer.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.converterContainer.update();
-		this.changeTracking.update();
-		this.customizer.update();
-	}
-
-
-	// ********** converter container **********
-
-	public JavaEclipseLinkConverterContainer getConverterContainer() {
-		return this.converterContainer;
-	}
-
-	protected JavaEclipseLinkConverterContainer buildConverterContainer() {
-		return new JavaEclipseLinkConverterContainerImpl(this);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(
-					this.converterContainer.getConverters(),
-					this.getAttributeMappingConverters()
-				);
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters() {
-		return new FilteringIterable<EclipseLinkConverter>(this.getAttributeMappingConverters_(), NotNullFilter.<EclipseLinkConverter>instance());
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters_() {
-		return new TransformationIterable<AttributeMapping, EclipseLinkConverter>(this.getAttributeMappings(), ATTRIBUTE_MAPPING_CONVERTER_TRANSFORMER);
-	}
-
-
-	// ********** change tracking **********
-
-	public EclipseLinkChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	protected JavaEclipseLinkChangeTracking buildChangeTracking() {
-		return new JavaEclipseLinkChangeTracking(this);
-	}
-
-
-	// ********** customizer **********
-
-	public EclipseLinkCustomizer getCustomizer() {
-		return this.customizer;
-	}
-
-	protected JavaEclipseLinkCustomizer buildCustomizer() {
-		return new JavaEclipseLinkCustomizer(this);
-	}
-
-
-	// ********** misc **********
-
-	public boolean usesPrimaryKeyColumns() {
-		return false;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.converterContainer.validate(messages, reporter, astRoot);
-		this.changeTracking.validate(messages, reporter, astRoot);
-		this.customizer.validate(messages, reporter, astRoot);
-	}
-
-	@Override
-	protected JptValidator buildTypeMappingValidator(CompilationUnit astRoot) {
-		return new EclipseLinkTypeMappingValidator(this, this.getJavaResourceType(), this.buildTextRangeResolver(astRoot));
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java
deleted file mode 100644
index 2a9e0d4a04..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEntityImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.utility.internal.NotNullFilter;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaEntity;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkReadOnly;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkEntityPrimaryKeyValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkTypeMappingValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java.EclipseLinkClassExtractorAnnotation2_1;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * EclipseLink
- * Java entity
- */
-public class JavaEclipseLinkEntityImpl
-	extends AbstractJavaEntity
-	implements JavaEclipseLinkEntity
-{
-	protected final JavaEclipseLinkCaching caching;
-
-	protected final JavaEclipseLinkReadOnly readOnly;
-
-	protected final JavaEclipseLinkConverterContainer converterContainer;
-
-	protected final JavaEclipseLinkChangeTracking changeTracking;
-
-	protected final JavaEclipseLinkCustomizer customizer;
-
-
-	public JavaEclipseLinkEntityImpl(JavaPersistentType parent, EntityAnnotation mappingAnnotation) {
-		super(parent, mappingAnnotation);
-		this.caching = this.buildCaching();
-		this.readOnly = this.buildReadOnly();
-		this.converterContainer = this.buildConverterContainer();
-		this.changeTracking = this.buildChangeTracking();
-		this.customizer = this.buildCustomizer();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.caching.synchronizeWithResourceModel();
-		this.readOnly.synchronizeWithResourceModel();
-		this.converterContainer.synchronizeWithResourceModel();
-		this.changeTracking.synchronizeWithResourceModel();
-		this.customizer.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.caching.update();
-		this.readOnly.update();
-		this.converterContainer.update();
-		this.changeTracking.update();
-		this.customizer.update();
-	}
-
-
-	// ********** caching **********
-
-	public JavaEclipseLinkCaching getCaching() {
-		return this.caching;
-	}
-
-	protected JavaEclipseLinkCaching buildCaching() {
-		return new JavaEclipseLinkCachingImpl(this);
-	}
-
-
-	// ********** read-only **********
-
-	public EclipseLinkReadOnly getReadOnly() {
-		return this.readOnly;
-	}
-
-	protected JavaEclipseLinkReadOnly buildReadOnly() {
-		return new JavaEclipseLinkReadOnly(this);
-	}
-
-
-	// ********** converter container **********
-
-	public JavaEclipseLinkConverterContainer getConverterContainer() {
-		return this.converterContainer;
-	}
-
-	protected JavaEclipseLinkConverterContainer buildConverterContainer() {
-		return new JavaEclipseLinkConverterContainerImpl(this);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(
-					this.converterContainer.getConverters(),
-					this.getAttributeMappingConverters()
-				);
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters() {
-		return new FilteringIterable<EclipseLinkConverter>(this.getAttributeMappingConverters_(), NotNullFilter.<EclipseLinkConverter>instance());
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters_() {
-		return new TransformationIterable<AttributeMapping, EclipseLinkConverter>(this.getAttributeMappings(), ATTRIBUTE_MAPPING_CONVERTER_TRANSFORMER);
-	}
-
-
-	// ********** change tracking **********
-
-	public EclipseLinkChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	protected JavaEclipseLinkChangeTracking buildChangeTracking() {
-		return new JavaEclipseLinkChangeTracking(this);
-	}
-
-
-	// ********** customizer **********
-
-	public EclipseLinkCustomizer getCustomizer() {
-		return this.customizer;
-	}
-
-	protected JavaEclipseLinkCustomizer buildCustomizer() {
-		return new JavaEclipseLinkCustomizer(this);
-	}
-
-
-	// ********** discriminator column **********
-
-	@Override
-	protected boolean buildSpecifiedDiscriminatorColumnIsAllowed() {
-		return super.buildSpecifiedDiscriminatorColumnIsAllowed() && ! this.classExtractorIsSpecified();
-	}
-
-	protected boolean classExtractorIsSpecified() {
-		return this.getClassExtractorAnnotation() != null;
-	}
-
-	protected EclipseLinkClassExtractorAnnotation2_1 getClassExtractorAnnotation() {
-		return (EclipseLinkClassExtractorAnnotation2_1) this.getJavaResourceType().getAnnotation(EclipseLinkClassExtractorAnnotation2_1.ANNOTATION_NAME);
-	}
-
-
-	// ********** misc **********
-
-	public boolean usesPrimaryKeyColumns() {
-		return this.getJavaResourceType().getAnnotation(EclipseLink.PRIMARY_KEY) != null;
-	}
-
-	public JavaCacheable2_0 getCacheable() {
-		return ((JavaCacheableHolder2_0) this.getCaching()).getCacheable();
-	}
-
-	public boolean calculateDefaultCacheable() {
-		return ((JavaCacheableHolder2_0) this.getCaching()).calculateDefaultCacheable();
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.caching.validate(messages, reporter, astRoot);
-		this.readOnly.validate(messages, reporter, astRoot);
-		this.converterContainer.validate(messages, reporter, astRoot);
-		this.changeTracking.validate(messages, reporter, astRoot);
-		this.customizer.validate(messages, reporter, astRoot);
-	}
-
-	@Override
-	protected JptValidator buildPrimaryKeyValidator(CompilationUnit astRoot) {
-		return new EclipseLinkEntityPrimaryKeyValidator(this, this.buildTextRangeResolver(astRoot));
-	}
-
-	@Override
-	protected JptValidator buildTypeMappingValidator(CompilationUnit astRoot) {
-		return new EclipseLinkTypeMappingValidator(this, this.getJavaResourceType(), buildTextRangeResolver(astRoot));
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java
deleted file mode 100644
index 3e7c5f9659..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaConverter;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaIdMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkIdMapping
-	extends AbstractJavaIdMapping
-	implements EclipseLinkIdMapping
-{
-	protected final JavaEclipseLinkMutable mutable;
-
-
-	public JavaEclipseLinkIdMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.mutable = new JavaEclipseLinkMutable(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.mutable.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-
-
-	// ********** mutable **********
-
-	public EclipseLinkMutable getMutable() {
-		return this.mutable;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * put the EclipseLink convert adapter first - this is the order EclipseLink searches
-	 */
-	@Override
-	protected Iterable<JavaConverter.Adapter> getConverterAdapters() {
-		return new CompositeIterable<JavaConverter.Adapter>(JavaEclipseLinkConvert.Adapter.instance(), super.getConverterAdapters());
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.mutable.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java
deleted file mode 100644
index fcb9dd1148..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkJoinFetch.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.JoinFetchType;
-
-public class JavaEclipseLinkJoinFetch
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkJoinFetch
-{
-	protected EclipseLinkJoinFetchType value;
-
-
-	public JavaEclipseLinkJoinFetch(JavaAttributeMapping parent) {
-		super(parent);
-		this.value = this.buildValue();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** value **********
-
-	public EclipseLinkJoinFetchType getValue() {
-		return this.value;
-	}
-
-	public void setValue(EclipseLinkJoinFetchType value) {
-		if (this.valuesAreDifferent(value, this.value)) {
-			EclipseLinkJoinFetchAnnotation annotation = this.getJoinFetchAnnotation();
-			if (value == null) {
-				if (annotation != null) {
-					this.removeJoinFetchAnnotation();
-				}
-			} else {
-				if (annotation == null) {
-					annotation = this.addJoinFetchAnnotation();
-				}
-				annotation.setValue(EclipseLinkJoinFetchType.toJavaResourceModel(value));
-			}
-
-			this.setValue_(value);
-		}
-	}
-
-	protected void setValue_(EclipseLinkJoinFetchType value) {
-		EclipseLinkJoinFetchType old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	private EclipseLinkJoinFetchType buildValue() {
-		EclipseLinkJoinFetchAnnotation annotation = this.getJoinFetchAnnotation();
-		if (annotation == null) {
-			return null;
-		}
-		JoinFetchType annotationValue = annotation.getValue();
-		return (annotationValue != null) ?
-				EclipseLinkJoinFetchType.fromJavaResourceModel(annotationValue) :
-				this.getDefaultValue(); // @JoinFetch is equivalent to @JoinFetch(JoinFetch.INNER)
-	}
-
-	protected EclipseLinkJoinFetchType getDefaultValue() {
-		return DEFAULT_VALUE;
-	}
-
-
-	// ********** join fetch annotation **********
-
-	protected EclipseLinkJoinFetchAnnotation getJoinFetchAnnotation() {
-		return (EclipseLinkJoinFetchAnnotation) this.getResourceAttribute().getAnnotation(this.getJoinFetchAnnotationName());
-	}
-
-	protected EclipseLinkJoinFetchAnnotation addJoinFetchAnnotation() {
-		return (EclipseLinkJoinFetchAnnotation) this.getResourceAttribute().addAnnotation(this.getJoinFetchAnnotationName());
-	}
-
-	protected void removeJoinFetchAnnotation() {
-		this.getResourceAttribute().removeAnnotation(this.getJoinFetchAnnotationName());
-	}
-
-	protected String getJoinFetchAnnotationName() {
-		return EclipseLinkJoinFetchAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaAttributeMapping getParent() {
-		return (JavaAttributeMapping) super.getParent();
-	}
-
-	protected JavaAttributeMapping getAttributeMapping() {
-		return this.getParent();
-	}
-
-	protected JavaResourceAttribute getResourceAttribute() {
-		return this.getAttributeMapping().getResourceAttribute();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getAnnotationTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(astRoot);
-	}
-
-	protected TextRange getAnnotationTextRange(CompilationUnit astRoot) {
-		EclipseLinkJoinFetchAnnotation annotation = this.getJoinFetchAnnotation();
-		return (annotation == null) ? null : annotation.getTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java
deleted file mode 100644
index 00ae92279f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToManyMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkManyToManyMapping
-	extends AbstractJavaManyToManyMapping
-	implements EclipseLinkRelationshipMapping
-{
-	protected final JavaEclipseLinkJoinFetch joinFetch;
-	
-	
-	public JavaEclipseLinkManyToManyMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new JavaEclipseLinkJoinFetch(this);
-	}
-	
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-	
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.joinFetch.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java
deleted file mode 100644
index 69c63f635e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkManyToOneMapping
-	extends AbstractJavaManyToOneMapping
-	implements EclipseLinkRelationshipMapping
-{
-	protected final JavaEclipseLinkJoinFetch joinFetch;
-
-
-	public JavaEclipseLinkManyToOneMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new JavaEclipseLinkJoinFetch(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.joinFetch.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java
deleted file mode 100644
index 28d6f3d5d9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMappedSuperclassImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.utility.internal.NotNullFilter;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaMappedSuperclass;
-import org.eclipse.jpt.jpa.core.jpa2.context.CacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.resource.java.MappedSuperclassAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkReadOnly;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkMappedSuperclassPrimaryKeyValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkMappedSuperclassValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * EclipseLink
- * Java mapped superclass
- */
-public class JavaEclipseLinkMappedSuperclassImpl
-	extends AbstractJavaMappedSuperclass
-	implements JavaEclipseLinkMappedSuperclass, JavaCacheableHolder2_0
-{
-	protected final JavaEclipseLinkCaching caching;
-
-	protected final JavaEclipseLinkReadOnly readOnly;
-
-	protected final JavaEclipseLinkConverterContainer converterContainer;
-
-	protected final JavaEclipseLinkChangeTracking changeTracking;
-
-	protected final JavaEclipseLinkCustomizer customizer;
-
-
-	public JavaEclipseLinkMappedSuperclassImpl(JavaPersistentType parent, MappedSuperclassAnnotation mappingAnnotation) {
-		super(parent, mappingAnnotation);
-		this.caching = this.buildCaching();
-		this.readOnly = this.buildReadOnly();
-		this.converterContainer = this.buildConverterContainer();
-		this.changeTracking = this.buildChangeTracking();
-		this.customizer = this.buildCustomizer();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.caching.synchronizeWithResourceModel();
-		this.readOnly.synchronizeWithResourceModel();
-		this.converterContainer.synchronizeWithResourceModel();
-		this.changeTracking.synchronizeWithResourceModel();
-		this.customizer.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.caching.update();
-		this.readOnly.update();
-		this.converterContainer.update();
-		this.changeTracking.update();
-		this.customizer.update();
-	}
-
-
-	// ********** caching **********
-
-	public JavaEclipseLinkCaching getCaching() {
-		return this.caching;
-	}
-
-	protected JavaEclipseLinkCaching buildCaching() {
-		return new JavaEclipseLinkCachingImpl(this);
-	}
-
-
-	// ********** read-only **********
-
-	public EclipseLinkReadOnly getReadOnly() {
-		return this.readOnly;
-	}
-
-	protected JavaEclipseLinkReadOnly buildReadOnly() {
-		return new JavaEclipseLinkReadOnly(this);
-	}
-
-
-	// ********** converter container **********
-
-	public JavaEclipseLinkConverterContainer getConverterContainer() {
-		return this.converterContainer;
-	}
-
-	protected JavaEclipseLinkConverterContainer buildConverterContainer() {
-		return new JavaEclipseLinkConverterContainerImpl(this);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(
-					this.converterContainer.getConverters(),
-					this.getAttributeMappingConverters()
-				);
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters() {
-		return new FilteringIterable<EclipseLinkConverter>(this.getAttributeMappingConverters_(), NotNullFilter.<EclipseLinkConverter>instance());
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters_() {
-		return new TransformationIterable<AttributeMapping, EclipseLinkConverter>(this.getAttributeMappings(), ATTRIBUTE_MAPPING_CONVERTER_TRANSFORMER);
-	}
-
-
-	// ********** change tracking **********
-
-	public EclipseLinkChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	protected JavaEclipseLinkChangeTracking buildChangeTracking() {
-		return new JavaEclipseLinkChangeTracking(this);
-	}
-
-
-	// ********** customizer **********
-
-	public EclipseLinkCustomizer getCustomizer() {
-		return this.customizer;
-	}
-
-	protected JavaEclipseLinkCustomizer buildCustomizer() {
-		return new JavaEclipseLinkCustomizer(this);
-	}
-
-
-	// ********** misc **********
-
-	public boolean usesPrimaryKeyColumns() {
-		return this.getJavaResourceType().getAnnotation(EclipseLink.PRIMARY_KEY) != null;
-	}
-
-	public JavaCacheable2_0 getCacheable() {
-		return ((JavaCacheableHolder2_0) this.getCaching()).getCacheable();
-	}
-
-	public boolean calculateDefaultCacheable() {
-		return ((CacheableHolder2_0) this.getCaching()).calculateDefaultCacheable();
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.caching.validate(messages, reporter, astRoot);
-		this.readOnly.validate(messages, reporter, astRoot);
-		this.converterContainer.validate(messages, reporter, astRoot);
-		this.changeTracking.validate(messages, reporter, astRoot);
-		this.customizer.validate(messages, reporter, astRoot);
-	}
-
-	@Override
-	protected JptValidator buildPrimaryKeyValidator(CompilationUnit astRoot) {
-		return new EclipseLinkMappedSuperclassPrimaryKeyValidator(this, this.buildTextRangeResolver(astRoot));
-	}
-
-	@Override
-	protected JptValidator buildTypeMappingValidator(CompilationUnit astRoot) {
-		return new EclipseLinkMappedSuperclassValidator(this, this.getJavaResourceType(), this.buildTextRangeResolver(astRoot));
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java
deleted file mode 100644
index 7e4c066ec9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkMutable.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkMutableAnnotation;
-
-public class JavaEclipseLinkMutable
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkMutable
-{
-	protected Boolean specifiedMutable;
-	protected boolean defaultMutable;
-
-
-	public JavaEclipseLinkMutable(JavaAttributeMapping parent) {
-		super(parent);
-		this.specifiedMutable = this.buildSpecifiedMutable();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedMutable_(this.buildSpecifiedMutable());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDefaultMutable(this.buildDefaultMutable());
-	}
-
-
-	// ********** mutable **********
-
-	public boolean isMutable() {
-		return (this.specifiedMutable != null) ? this.specifiedMutable.booleanValue() : this.defaultMutable;
-	}
-
-	public Boolean getSpecifiedMutable() {
-		return this.specifiedMutable;
-	}
-
-	public void setSpecifiedMutable(Boolean mutable) {
-		if (this.valuesAreDifferent(mutable, this.specifiedMutable)) {
-			EclipseLinkMutableAnnotation annotation = this.getMutableAnnotation();
-			if (mutable == null) {
-				if (annotation != null) {
-					this.removeMutableAnnotation();
-				}
-			} else {
-				if (annotation == null) {
-					annotation = this.addMutableAnnotation();
-				}
-				Boolean annotationValue = annotation.getValue();
-				boolean annotationBooleanValue = (annotationValue == null) ? true : annotationValue.booleanValue();
-				if (annotationBooleanValue != mutable.booleanValue()) {
-					annotation.setValue(mutable);
-				}
-			}
-
-			this.setSpecifiedMutable_(mutable);
-		}
-	}
-
-	protected void setSpecifiedMutable_(Boolean mutable) {
-		Boolean old = this.specifiedMutable;
-		this.specifiedMutable = mutable;
-		this.firePropertyChanged(SPECIFIED_MUTABLE_PROPERTY, old, mutable);
-	}
-
-	protected Boolean buildSpecifiedMutable() {
-		EclipseLinkMutableAnnotation annotation = this.getMutableAnnotation();
-		if (annotation == null) {
-			return null;
-		}
-
-		// @Mutable is equivalent to @Mutable(true)
-		Boolean annotationValue = annotation.getValue();
-		return (annotationValue == null) ? Boolean.TRUE : annotationValue;
-	}
-
-	public boolean isDefaultMutable() {
-		return this.defaultMutable;
-	}
-
-	protected void setDefaultMutable(boolean mutable) {
-		boolean old = this.defaultMutable;
-		this.defaultMutable = mutable;
-		this.firePropertyChanged(DEFAULT_MUTABLE_PROPERTY, old, mutable);
-	}
-
-	protected boolean buildDefaultMutable() {
-		JavaEclipseLinkPersistentAttribute javaAttribute = this.getPersistentAttribute();
-		if (javaAttribute.typeIsDateOrCalendar()) {
-			Boolean puTemporalMutable = this.getPersistenceUnit().getOptions().getTemporalMutable();
-			return (puTemporalMutable == null) ? false : puTemporalMutable.booleanValue();
-		}
-		return javaAttribute.typeIsSerializable();
-	}
-
-
-	// ********** mutable annotation **********
-
-	protected EclipseLinkMutableAnnotation getMutableAnnotation() {
-		return (EclipseLinkMutableAnnotation) this.getResourceAttribute().getAnnotation(this.getMutableAnnotationName());
-	}
-
-	protected EclipseLinkMutableAnnotation addMutableAnnotation() {
-		return (EclipseLinkMutableAnnotation) this.getResourceAttribute().addAnnotation(this.getMutableAnnotationName());
-	}
-
-	protected void removeMutableAnnotation() {
-		this.getResourceAttribute().removeAnnotation(this.getMutableAnnotationName());
-	}
-
-	protected String getMutableAnnotationName() {
-		return EclipseLinkMutableAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaAttributeMapping getParent() {
-		return (JavaAttributeMapping) super.getParent();
-	}
-
-	protected JavaAttributeMapping getAttributeMapping() {
-		return this.getParent();
-	}
-
-	protected JavaResourceAttribute getResourceAttribute() {
-		return this.getAttributeMapping().getResourceAttribute();
-	}
-
-	protected JavaEclipseLinkPersistentAttribute getPersistentAttribute() {
-		return (JavaEclipseLinkPersistentAttribute) this.getAttributeMapping().getPersistentAttribute();
-	}
-
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getAnnotationTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(astRoot);
-	}
-
-	protected TextRange getAnnotationTextRange(CompilationUnit astRoot) {
-		EclipseLinkMutableAnnotation annotation = this.getMutableAnnotation();
-		return (annotation == null) ? null : annotation.getTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkObjectTypeConverter.java
deleted file mode 100644
index c8c8c8b7c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkObjectTypeConverter.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConversionValue;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkObjectTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConversionValueAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkObjectTypeConverterAnnotation;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * <code>org.eclipse.persistence.annotations.ObjectTypeConverter</code>
- */
-public class JavaEclipseLinkObjectTypeConverter
-	extends JavaEclipseLinkConverter<EclipseLinkObjectTypeConverterAnnotation>
-	implements EclipseLinkObjectTypeConverter
-{
-	private String dataType;
-	private String fullyQualifiedDataType;
-		public static final String FULLY_QUALIFIED_DATA_TYPE_PROPERTY = "fullyQualifiedDataType"; //$NON-NLS-1$
-
-	private String objectType;
-	private String fullyQualifiedObjectType;
-		public static final String FULLY_QUALIFIED_OBJECT_TYPE_PROPERTY = "fullyQualifiedObjectType"; //$NON-NLS-1$
-
-	protected final ContextListContainer<JavaEclipseLinkConversionValue, EclipseLinkConversionValueAnnotation> conversionValueContainer;
-
-	private String defaultObjectValue;
-
-
-	public JavaEclipseLinkObjectTypeConverter(JavaJpaContextNode parent, EclipseLinkObjectTypeConverterAnnotation converterAnnotation) {
-		super(parent, converterAnnotation);
-		this.dataType = converterAnnotation.getDataType();
-		this.objectType = converterAnnotation.getObjectType();
-		this.conversionValueContainer = this.buildConversionValueContainer();
-		this.defaultObjectValue = converterAnnotation.getDefaultObjectValue();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setDataType_(this.converterAnnotation.getDataType());
-		this.setObjectType_(this.converterAnnotation.getObjectType());
-		this.syncConversionValues();
-		this.setDefaultObjectValue_(this.converterAnnotation.getDefaultObjectValue());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setFullyQualifiedDataType(this.converterAnnotation.getFullyQualifiedDataType());
-		this.setFullyQualifiedObjectType(this.converterAnnotation.getFullyQualifiedObjectType());
-		this.updateConversionValues();
-	}
-
-
-	// ********** data type **********
-
-	public String getDataType() {
-		return this.dataType;
-	}
-
-	public void setDataType(String dataType) {
-		this.converterAnnotation.setDataType(dataType);
-		this.setDataType_(dataType);
-	}
-
-	protected void setDataType_(String dataType) {
-		String old = this.dataType;
-		this.dataType = dataType;
-		this.firePropertyChanged(DATA_TYPE_PROPERTY, old, dataType);
-	}
-
-
-	// ********** fully qualified data type **********
-
-	public String getFullyQualifiedDataType() {
-		return this.fullyQualifiedDataType;
-	}
-
-	protected void setFullyQualifiedDataType(String dataType) {
-		String old = this.fullyQualifiedDataType;
-		this.fullyQualifiedDataType = dataType;
-		this.firePropertyChanged(FULLY_QUALIFIED_DATA_TYPE_PROPERTY, old, dataType);
-	}
-
-
-	// ********** object type **********
-
-	public String getObjectType() {
-		return this.objectType;
-	}
-
-	public void setObjectType(String objectType) {
-		this.converterAnnotation.setObjectType(objectType);
-		this.setObjectType_(objectType);
-	}
-
-	protected void setObjectType_(String objectType) {
-		String old = this.objectType;
-		this.objectType = objectType;
-		this.firePropertyChanged(OBJECT_TYPE_PROPERTY, old, objectType);
-	}
-
-
-	// ********** fully qualified object type **********
-
-	public String getFullyQualifiedObjectType() {
-		return this.fullyQualifiedObjectType;
-	}
-
-	protected void setFullyQualifiedObjectType(String objectType) {
-		String old = this.fullyQualifiedObjectType;
-		this.fullyQualifiedObjectType = objectType;
-		this.firePropertyChanged(FULLY_QUALIFIED_OBJECT_TYPE_PROPERTY, old, objectType);
-	}
-
-
-	// ********** conversion values **********
-
-	public ListIterable<JavaEclipseLinkConversionValue> getConversionValues() {
-		return this.conversionValueContainer.getContextElements();
-	}
-
-	public int getConversionValuesSize() {
-		return this.conversionValueContainer.getContextElementsSize();
-	}
-
-	public JavaEclipseLinkConversionValue addConversionValue() {
-		return this.addConversionValue(this.getConversionValuesSize());
-	}
-
-	public JavaEclipseLinkConversionValue addConversionValue(int index) {
-		EclipseLinkConversionValueAnnotation annotation = this.converterAnnotation.addConversionValue(index);
-		return this.conversionValueContainer.addContextElement(index, annotation);
-	}
-  
-	public void removeConversionValue(EclipseLinkConversionValue conversionValue) {
-		this.removeConversionValue(this.conversionValueContainer.indexOfContextElement((JavaEclipseLinkConversionValue) conversionValue));
-	}
-
-	public void removeConversionValue(int index) {
-		this.converterAnnotation.removeConversionValue(index);
-		this.conversionValueContainer.removeContextElement(index);
-	}
-
-	public void moveConversionValue(int targetIndex, int sourceIndex) {
-		this.converterAnnotation.moveConversionValue(targetIndex, sourceIndex);
-		this.conversionValueContainer.moveContextElement(targetIndex, sourceIndex);
-	}
-
-	protected JavaEclipseLinkConversionValue buildConversionValue(EclipseLinkConversionValueAnnotation conversionValueAnnotation) {
-		return new JavaEclipseLinkConversionValue(this, conversionValueAnnotation);
-	}
-	
-	protected void syncConversionValues() {
-		this.conversionValueContainer.synchronizeWithResourceModel();
-	}
-	
-	protected void updateConversionValues() {
-		this.conversionValueContainer.update();
-	}
-
-	protected ListIterable<EclipseLinkConversionValueAnnotation> getConversionValueAnnotations() {
-		return this.converterAnnotation.getConversionValues();
-	}
-
-	protected ContextListContainer<JavaEclipseLinkConversionValue, EclipseLinkConversionValueAnnotation> buildConversionValueContainer() {
-		return new ConversionValueContainer();
-	}
-
-	/**
-	 * conversion value container
-	 */
-	protected class ConversionValueContainer
-			extends ContextListContainer<JavaEclipseLinkConversionValue, EclipseLinkConversionValueAnnotation> {
-		
-		@Override
-		protected String getContextElementsPropertyName() {
-			return CONVERSION_VALUES_LIST;
-		}
-		
-		@Override
-		protected JavaEclipseLinkConversionValue buildContextElement(EclipseLinkConversionValueAnnotation resourceElement) {
-			return JavaEclipseLinkObjectTypeConverter.this.buildConversionValue(resourceElement);
-		}
-		
-		@Override
-		protected ListIterable<EclipseLinkConversionValueAnnotation> getResourceElements() {
-			return JavaEclipseLinkObjectTypeConverter.this.getConversionValueAnnotations();
-		}
-		
-		@Override
-		protected EclipseLinkConversionValueAnnotation getResourceElement(JavaEclipseLinkConversionValue contextElement) {
-			return contextElement.getConversionValueAnnotation();
-		}
-	}
-
-
-	// ********** data values **********
-
-	public Iterable<String> getDataValues() {
-		return new TransformationIterable<JavaEclipseLinkConversionValue, String>(this.getConversionValues()) {
-			@Override
-			protected String transform(JavaEclipseLinkConversionValue conversionValue) {
-				return conversionValue.getDataValue();
-			}
-		};
-	}
-
-	public int getDataValuesSize() {
-		return this.getConversionValuesSize();
-	}
-
-
-	// ********** default object value **********
-
-	public String getDefaultObjectValue() {
-		return this.defaultObjectValue;
-	}
-
-	public void setDefaultObjectValue(String value) {
-		this.converterAnnotation.setDefaultObjectValue(value);
-		this.setDefaultObjectValue_(value);
-	}
-
-	protected void setDefaultObjectValue_(String value) {
-		String old = this.defaultObjectValue;
-		this.defaultObjectValue = value;
-		this.firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, old, value);
-	}
-
-
-	// ********** misc **********
-
-	public Class<EclipseLinkObjectTypeConverter> getType() {
-		return EclipseLinkObjectTypeConverter.class;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.checkForDuplicateDataValues(messages, astRoot);
-		for (JavaEclipseLinkConversionValue conversionValue : this.getConversionValues()) {
-			conversionValue.validate(messages, reporter, astRoot);
-		}
-	}
-
-	protected void checkForDuplicateDataValues(List<IMessage> messages, CompilationUnit astRoot) {
-		for (ArrayList<JavaEclipseLinkConversionValue> dups : this.mapConversionValuesByDataValue().values()) {
-			if (dups.size() > 1) {
-				for (JavaEclipseLinkConversionValue dup : dups) {
-					messages.add(
-						DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE,
-							new String[] {dup.getDataValue()},
-							this,
-							dup.getDataValueTextRange(astRoot)
-						)
-					);
-				}
-			}
-		}
-	}
-
-	protected HashMap<String, ArrayList<JavaEclipseLinkConversionValue>> mapConversionValuesByDataValue() {
-		HashMap<String, ArrayList<JavaEclipseLinkConversionValue>> map = new HashMap<String, ArrayList<JavaEclipseLinkConversionValue>>(this.getConversionValuesSize());
-		for (JavaEclipseLinkConversionValue conversionValue : this.getConversionValues()) {
-			String dataValue = conversionValue.getDataValue();
-			ArrayList<JavaEclipseLinkConversionValue> list = map.get(dataValue);
-			if (list == null) {
-				list = new ArrayList<JavaEclipseLinkConversionValue>();
-				map.put(dataValue, list);
-			}
-			list.add(conversionValue);
-		}
-		return map;
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<EclipseLinkObjectTypeConverter> getConverterType() {
-			return EclipseLinkObjectTypeConverter.class;
-		}
-
-		@Override
-		protected String getAnnotationName() {
-			return EclipseLinkObjectTypeConverterAnnotation.ANNOTATION_NAME;
-		}
-
-		public JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildConverter(EclipseLinkNamedConverterAnnotation converterAnnotation, JavaJpaContextNode parent) {
-			return new JavaEclipseLinkObjectTypeConverter(parent, (EclipseLinkObjectTypeConverterAnnotation) converterAnnotation);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java
deleted file mode 100644
index afb73f485d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.jpa.core.context.java.JavaMappingRelationship;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToManyMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.EclipseLinkOneToManyMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.java.EclipseLinkJavaOneToManyRelationship2_0;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkOneToManyMapping
-	extends AbstractJavaOneToManyMapping
-	implements EclipseLinkOneToManyMapping2_0
-{
-	protected final JavaEclipseLinkJoinFetch joinFetch;
-
-	protected final JavaEclipseLinkPrivateOwned privateOwned;
-
-
-	public JavaEclipseLinkOneToManyMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new JavaEclipseLinkJoinFetch(this);
-		this.privateOwned = new JavaEclipseLinkPrivateOwned(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.privateOwned.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.privateOwned.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** private owned **********
-
-	public EclipseLinkPrivateOwned getPrivateOwned() {
-		return this.privateOwned;
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-
-	// ********** relationship **********
-
-	@Override
-	public EclipseLinkJavaOneToManyRelationship2_0 getRelationship() {
-		return (EclipseLinkJavaOneToManyRelationship) super.getRelationship();
-	}
-
-	@Override
-	protected JavaMappingRelationship buildRelationship() {
-		return new EclipseLinkJavaOneToManyRelationship(this);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.joinFetch.validate(messages, reporter, astRoot);
-		this.privateOwned.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java
deleted file mode 100644
index 9c13729ff3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.EclipseLinkOneToOneMapping2_0;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkOneToOneMapping
-	extends AbstractJavaOneToOneMapping
-	implements EclipseLinkOneToOneMapping2_0
-{
-	protected final JavaEclipseLinkJoinFetch joinFetch;
-
-	protected final JavaEclipseLinkPrivateOwned privateOwned;
-
-
-	public JavaEclipseLinkOneToOneMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new JavaEclipseLinkJoinFetch(this);
-		this.privateOwned = new JavaEclipseLinkPrivateOwned(this);
-	}
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.privateOwned.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.privateOwned.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** private owned **********
-
-	public EclipseLinkPrivateOwned getPrivateOwned() {
-		return this.privateOwned;
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.joinFetch.validate(messages, reporter, astRoot);
-		this.privateOwned.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPersistentAttribute.java
deleted file mode 100644
index 9a3ab9d256..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPersistentAttribute.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
-import org.eclipse.jpt.common.utility.internal.Tools;
-import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.java.Accessor;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkPersistentAttributeValidator;
-
-/**
- * EclipseLink Java persistent attribute
- */
-public class JavaEclipseLinkPersistentAttribute
-	extends AbstractJavaPersistentAttribute
-{
-
-	public JavaEclipseLinkPersistentAttribute(PersistentType parent, JavaResourceField resourceField) {
-		super(parent,resourceField);
-	}
-
-	public JavaEclipseLinkPersistentAttribute(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) {
-		super(parent, resourceGetter, resourceSetter);
-	}
-
-	public JavaEclipseLinkPersistentAttribute(PersistentType parent, Accessor accessor) {
-		super(parent, accessor);
-	}
-
-	// ********** mapping **********
-
-	@Override
-	protected JavaAttributeMappingDefinition getSpecifiedMappingDefinition(String key) {
-		if (this.specifiedKeyIsInvalid(key)) {
-			throw new IllegalArgumentException("invalid mapping: " + key); //$NON-NLS-1$
-		}
-		return super.getSpecifiedMappingDefinition(key);
-	}
-
-	/**
-	 * EclipseLink does not support setting an attribute with a default 1:1
-	 * mapping to a specified mapping of ID; because the resulting ID annotation
-	 * indicates a primary key derived from the 1:1 mapping, <em>not</em> an ID
-	 * mapping.
-	 */
-	protected boolean specifiedKeyIsInvalid(String key) {
-		return Tools.valuesAreEqual(key, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY) &&
-			Tools.valuesAreEqual(this.getDefaultMappingKey(), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY);
-	}
-
-
-	// ********** type **********
-
-	/**
-	 * Return whether the attribute's type is a subclass of
-	 * <code>java.util.Date</code> or <code>java.util.Calendar</code>.
-	 */
-	public boolean typeIsDateOrCalendar() {
-		return this.getResourceAttribute().typeIsSubTypeOf(DATE_TYPE_NAME)
-				|| this.getResourceAttribute().typeIsSubTypeOf(CALENDAR_TYPE_NAME);
-	}
-	protected static final String DATE_TYPE_NAME = java.util.Date.class.getName();
-	protected static final String CALENDAR_TYPE_NAME = java.util.Calendar.class.getName();
-
-	public boolean typeIsSerializable() {
-		return this.getResourceAttribute().typeIsVariablePrimitive()
-				|| this.getResourceAttribute().typeIsSubTypeOf(SERIALIZABLE_TYPE_NAME);
-	}
-
-	public boolean typeIsValidForVariableOneToOne() {
-		return this.getResourceAttribute().typeIsInterface()
-				&& this.interfaceIsValidForVariableOneToOne(getTypeName());
-	}
-
-	protected boolean interfaceIsValidForVariableOneToOne(String interfaceName) {
-		return ! this.interfaceIsInvalidForVariableOneToOne(interfaceName);
-	}
-
-	// TODO we could probably add more interfaces to this list...
-	protected boolean interfaceIsInvalidForVariableOneToOne(String interfaceName) {
-		return (interfaceName == null) ||
-				this.typeIsContainer(interfaceName) ||
-				interfaceName.equals("org.eclipse.persistence.indirection.ValueHolderInterface"); //$NON-NLS-1$
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	protected JptValidator buildAttributeValidator(CompilationUnit astRoot) {
-		return new EclipseLinkPersistentAttributeValidator(this, buildTextRangeResolver(astRoot));
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java
deleted file mode 100644
index 01b6e9238b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkPrivateOwned.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrivateOwnedAnnotation;
-
-public class JavaEclipseLinkPrivateOwned
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkPrivateOwned
-{
-	protected boolean privateOwned;
-
-
-	public JavaEclipseLinkPrivateOwned(JavaAttributeMapping parent) {
-		super(parent);
-		this.privateOwned = this.buildPrivateOwned();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setPrivateOwned_(this.buildPrivateOwned());
-	}
-
-
-	// ********** private owned **********
-
-	public boolean isPrivateOwned() {
-		return this.privateOwned;
-	}
-
-	public void setPrivateOwned(boolean privateOwned) {
-		if (privateOwned != this.privateOwned) {
-			EclipseLinkPrivateOwnedAnnotation annotation = this.getPrivateOwnedAnnotation();
-			if (privateOwned) {
-				if (annotation == null) {
-					this.addPrivateOwnedAnnotation();
-				}
-			} else {
-				if (annotation != null) {
-					this.removePrivateOwnedAnnotation();
-				}
-			}
-
-			this.setPrivateOwned_(privateOwned);
-		}
-	}
-
-	protected void setPrivateOwned_(boolean privateOwned) {
-		boolean old = this.privateOwned;
-		this.privateOwned = privateOwned;
-		this.firePropertyChanged(PRIVATE_OWNED_PROPERTY, old, privateOwned);
-	}
-
-	protected boolean buildPrivateOwned() {
-		return this.getPrivateOwnedAnnotation() != null;
-	}
-
-
-	// ********** private owned annotation **********
-
-	protected EclipseLinkPrivateOwnedAnnotation getPrivateOwnedAnnotation() {
-		return (EclipseLinkPrivateOwnedAnnotation) this.getResourceAttribute().getAnnotation(this.getPrivateOwnedAnnotationName());
-	}
-
-	protected EclipseLinkPrivateOwnedAnnotation addPrivateOwnedAnnotation() {
-		return (EclipseLinkPrivateOwnedAnnotation) this.getResourceAttribute().addAnnotation(this.getPrivateOwnedAnnotationName());
-	}
-
-	protected void removePrivateOwnedAnnotation() {
-		this.getResourceAttribute().removeAnnotation(this.getPrivateOwnedAnnotationName());
-	}
-
-	protected String getPrivateOwnedAnnotationName() {
-		return EclipseLinkPrivateOwnedAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaAttributeMapping getParent() {
-		return (JavaAttributeMapping) super.getParent();
-	}
-
-	protected JavaAttributeMapping getAttributeMapping() {
-		return this.getParent();
-	}
-
-	protected JavaResourceAttribute getResourceAttribute() {
-		return this.getAttributeMapping().getResourceAttribute();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getAnnotationTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange(astRoot);
-	}
-
-	protected TextRange getAnnotationTextRange(CompilationUnit astRoot) {
-		EclipseLinkPrivateOwnedAnnotation annotation = this.getPrivateOwnedAnnotation();
-		return (annotation == null) ? null : annotation.getTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java
deleted file mode 100644
index 0cc0da0052..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkReadOnly.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkReadOnly;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkNonEmbeddableTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkReadOnlyAnnotation;
-
-public class JavaEclipseLinkReadOnly
-	extends AbstractJavaJpaContextNode
-	implements EclipseLinkReadOnly
-{
-	protected Boolean specifiedReadOnly;  // TRUE or null
-
-
-	public JavaEclipseLinkReadOnly(JavaEclipseLinkNonEmbeddableTypeMapping parent) {
-		super(parent);
-		this.specifiedReadOnly = this.buildSpecifiedReadOnly();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedReadOnly_(this.buildSpecifiedReadOnly());
-	}
-
-
-	// ********** read-only **********
-
-	public boolean isReadOnly() {
-		return (this.specifiedReadOnly != null) ? this.specifiedReadOnly.booleanValue() : this.isDefaultReadOnly();
-	}
-
-	public Boolean getSpecifiedReadOnly() {
-		return this.specifiedReadOnly;
-	}
-
-	public void setSpecifiedReadOnly(Boolean readOnly) {
-		readOnly = (readOnly == null) ? null : readOnly.booleanValue() ? readOnly : null;
-		if (this.valuesAreDifferent(readOnly, this.specifiedReadOnly)) {
-			EclipseLinkReadOnlyAnnotation annotation = this.getReadOnlyAnnotation();
-			if (readOnly != null) {
-				if (annotation == null) {
-					this.addReadOnlyAnnotation();
-				}
-			} else {
-				if (annotation != null) {
-					this.removeReadOnlyAnnotation();
-				}
-			}
-
-			this.setSpecifiedReadOnly_(readOnly);
-		}
-	}
-
-	protected void setSpecifiedReadOnly_(Boolean readOnly) {
-		Boolean old = this.specifiedReadOnly;
-		this.specifiedReadOnly = readOnly;
-		this.firePropertyChanged(SPECIFIED_READ_ONLY_PROPERTY, old, readOnly);
-	}
-
-	private Boolean buildSpecifiedReadOnly() {
-		return (this.getReadOnlyAnnotation() == null) ? null : Boolean.TRUE;
-	}
-
-	public boolean isDefaultReadOnly() {
-		return DEFAULT_READ_ONLY;
-	}
-
-
-	// ********** read-only annotation **********
-
-	protected EclipseLinkReadOnlyAnnotation getReadOnlyAnnotation() {
-		return (EclipseLinkReadOnlyAnnotation) this.getJavaResourceType().getAnnotation(this.getReadOnlyAnnotationName());
-	}
-
-	protected void addReadOnlyAnnotation() {
-		this.getJavaResourceType().addAnnotation(this.getReadOnlyAnnotationName());
-	}
-
-	protected void removeReadOnlyAnnotation() {
-		this.getJavaResourceType().removeAnnotation(this.getReadOnlyAnnotationName());
-	}
-
-	protected String getReadOnlyAnnotationName() {
-		return EclipseLinkReadOnlyAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaEclipseLinkNonEmbeddableTypeMapping getParent() {
-		return (JavaEclipseLinkNonEmbeddableTypeMapping) super.getParent();
-	}
-
-	protected JavaEclipseLinkNonEmbeddableTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected JavaPersistentType getPersistentType() {
-		return this.getTypeMapping().getPersistentType();
-	}
-
-	protected JavaResourceType getJavaResourceType() {
-		return this.getTypeMapping().getJavaResourceType();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		TextRange textRange = this.getAnnotationTextRange(astRoot);
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange(astRoot);
-	}
-
-	protected TextRange getAnnotationTextRange(CompilationUnit astRoot) {
-		EclipseLinkReadOnlyAnnotation annotation = this.getReadOnlyAnnotation();
-		return (annotation == null) ? null : annotation.getTextRange(astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkStructConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkStructConverter.java
deleted file mode 100644
index 76a4cfa665..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkStructConverter.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkStructConverterAnnotation;
-
-/**
- * <code>org.eclipse.persistence.annotations.StructConverter</code>
- */
-public class JavaEclipseLinkStructConverter
-	extends JavaEclipseLinkConverterClassConverter<EclipseLinkStructConverterAnnotation>
-	implements EclipseLinkStructConverter
-{
-	public JavaEclipseLinkStructConverter(JavaJpaContextNode parent, EclipseLinkStructConverterAnnotation converterAnnotation) {
-		super(parent, converterAnnotation, converterAnnotation.getConverter());
-	}
-
-
-	// ********** converter class **********
-
-	@Override
-	protected String getAnnotationConverterClass() {
-		return this.converterAnnotation.getConverter();
-	}
-
-	@Override
-	protected void setAnnotationConverterClass(String converterClass) {
-		this.converterAnnotation.setConverter(converterClass);
-	}
-
-
-	// ********** misc **********
-
-	public Class<EclipseLinkStructConverter> getType() {
-		return EclipseLinkStructConverter.class;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	protected String getEclipseLinkConverterInterface() {
-		return ECLIPSELINK_STRUCT_CONVERTER_CLASS_NAME;
-	}
-
-	@Override
-	protected String getEclipseLinkConverterInterfaceErrorMessage() {
-		return EclipseLinkJpaValidationMessages.STRUCT_CONVERTER_CLASS_IMPLEMENTS_STRUCT_CONVERTER;
-	}
-
-	@Override
-	protected TextRange getAnnotationConverterClassTextRange(CompilationUnit astRoot) {
-		return this.converterAnnotation.getConverterTextRange(astRoot);
-	}
-
-	/**
-	 * Since the converter class is a string, it must be fully-qualified.
-	 */
-	@Override
-	protected String getFullyQualifiedConverterClass() {
-		return this.getConverterClass();
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<EclipseLinkStructConverter> getConverterType() {
-			return EclipseLinkStructConverter.class;
-		}
-
-		@Override
-		protected String getAnnotationName() {
-			return EclipseLinkStructConverterAnnotation.ANNOTATION_NAME;
-		}
-
-		public JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildConverter(EclipseLinkNamedConverterAnnotation converterAnnotation, JavaJpaContextNode parent) {
-			return new JavaEclipseLinkStructConverter(parent, (EclipseLinkStructConverterAnnotation) converterAnnotation);
-		}
-
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java
deleted file mode 100644
index 74a4d668d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformationAnnotation;
-
-public class JavaEclipseLinkTransformationMapping 
-	extends AbstractJavaAttributeMapping<EclipseLinkTransformationAnnotation> 
-	implements EclipseLinkTransformationMapping
-{
-	
-	public JavaEclipseLinkTransformationMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	@Override
-	protected String getAnnotationName() {
-		return EclipseLinkTransformationAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTypeConverter.java
deleted file mode 100644
index 4ffd941d1a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTypeConverter.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTypeConverterAnnotation;
-
-/**
- * <code>org.eclipse.persistence.annotations.TypeConverter</code>
- */
-public class JavaEclipseLinkTypeConverter
-	extends JavaEclipseLinkConverter<EclipseLinkTypeConverterAnnotation>
-	implements EclipseLinkTypeConverter
-{
-	private String dataType;
-	private String fullyQualifiedDataType;
-		public static final String FULLY_QUALIFIED_DATA_TYPE_PROPERTY = "fullyQualifiedDataType"; //$NON-NLS-1$
-
-	private String objectType;
-	private String fullyQualifiedObjectType;
-		public static final String FULLY_QUALIFIED_OBJECT_TYPE_PROPERTY = "fullyQualifiedObjectType"; //$NON-NLS-1$
-
-
-	public JavaEclipseLinkTypeConverter(JavaJpaContextNode parent, EclipseLinkTypeConverterAnnotation converterAnnotation) {
-		super(parent, converterAnnotation);
-		this.dataType = this.converterAnnotation.getDataType();
-		this.objectType = this.converterAnnotation.getObjectType();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setDataType_(this.converterAnnotation.getDataType());
-		this.setObjectType_(this.converterAnnotation.getObjectType());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setFullyQualifiedDataType(this.converterAnnotation.getFullyQualifiedDataType());
-		this.setFullyQualifiedObjectType(this.converterAnnotation.getFullyQualifiedObjectType());
-	}
-
-
-	// ********** data type **********
-
-	public String getDataType() {
-		return this.dataType;
-	}
-
-	public void setDataType(String dataType) {
-		this.converterAnnotation.setDataType(dataType);
-		this.setDataType_(dataType);
-	}
-
-	protected void setDataType_(String dataType) {
-		String old = this.dataType;
-		this.dataType = dataType;
-		this.firePropertyChanged(DATA_TYPE_PROPERTY, old, dataType);
-	}
-
-
-	// ********** fully qualified data type **********
-
-	public String getFullyQualifiedDataType() {
-		return this.fullyQualifiedDataType;
-	}
-
-	protected void setFullyQualifiedDataType(String dataType) {
-		String old = this.fullyQualifiedDataType;
-		this.fullyQualifiedDataType = dataType;
-		this.firePropertyChanged(FULLY_QUALIFIED_DATA_TYPE_PROPERTY, old, dataType);
-	}
-
-
-	// ********** object type **********
-
-	public String getObjectType() {
-		return this.objectType;
-	}
-
-	public void setObjectType(String objectType) {
-		this.converterAnnotation.setObjectType(objectType);
-		this.setObjectType_(objectType);
-	}
-
-	protected void setObjectType_(String objectType) {
-		String old = this.objectType;
-		this.objectType = objectType;
-		this.firePropertyChanged(OBJECT_TYPE_PROPERTY, old, objectType);
-	}
-
-
-	// ********** fully qualified object type **********
-
-	public String getFullyQualifiedObjectType() {
-		return this.fullyQualifiedObjectType;
-	}
-
-	protected void setFullyQualifiedObjectType(String objectType) {
-		String old = this.fullyQualifiedObjectType;
-		this.fullyQualifiedObjectType = objectType;
-		this.firePropertyChanged(FULLY_QUALIFIED_OBJECT_TYPE_PROPERTY, old, objectType);
-	}
-
-
-	// ********** misc **********
-
-	public Class<EclipseLinkTypeConverter> getType() {
-		return EclipseLinkTypeConverter.class;
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<EclipseLinkTypeConverter> getConverterType() {
-			return EclipseLinkTypeConverter.class;
-		}
-
-		@Override
-		protected String getAnnotationName() {
-			return EclipseLinkTypeConverterAnnotation.ANNOTATION_NAME;
-		}
-
-		public JavaEclipseLinkConverter<? extends EclipseLinkNamedConverterAnnotation> buildConverter(EclipseLinkNamedConverterAnnotation converterAnnotation, JavaJpaContextNode parent) {
-			return new JavaEclipseLinkTypeConverter(parent, (EclipseLinkTypeConverterAnnotation) converterAnnotation);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java
deleted file mode 100644
index a1ec8eefad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkVariableOneToOneAnnotation;
-
-public class JavaEclipseLinkVariableOneToOneMapping 
-	extends AbstractJavaAttributeMapping<EclipseLinkVariableOneToOneAnnotation>
-	implements EclipseLinkVariableOneToOneMapping
-{
-	
-	public JavaEclipseLinkVariableOneToOneMapping(JavaPersistentAttribute parent) {
-		super(parent);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	@Override
-	protected String getAnnotationName() {
-		return EclipseLinkVariableOneToOneAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java
deleted file mode 100644
index 00f02445cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaConverter;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVersionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JavaEclipseLinkVersionMapping
-	extends AbstractJavaVersionMapping
-	implements EclipseLinkVersionMapping
-{
-	protected final JavaEclipseLinkMutable mutable;
-
-
-	public JavaEclipseLinkVersionMapping(JavaPersistentAttribute parent) {
-		super(parent);
-		this.mutable = new JavaEclipseLinkMutable(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.mutable.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-
-
-	// ********** mutable **********
-
-	public EclipseLinkMutable getMutable() {
-		return this.mutable;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * put the EclipseLink convert adapter first - this is the order EclipseLink searches
-	 */
-	@Override
-	protected Iterable<JavaConverter.Adapter> getConverterAdapters() {
-		return new CompositeIterable<JavaConverter.Adapter>(JavaEclipseLinkConvert.Adapter.instance(), super.getConverterAdapters());
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.mutable.validate(messages, reporter, astRoot);
-	}
-	
-	@Override
-	protected void validateAttributeType(List<IMessage> messages, CompilationUnit astRoot) {
-		if (!ArrayTools.contains(SUPPORTED_TYPE_NAMES, this.getPersistentAttribute().getTypeName())) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_VERSION_MAPPING_TYPE,
-							new String[] {this.getName()},
-							this,
-							this.getValidationTextRange(astRoot)
-					)
-			);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractEclipseLinkOrmXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractEclipseLinkOrmXmlDefinition.java
deleted file mode 100644
index c204c74f62..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractEclipseLinkOrmXmlDefinition.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.ArrayList;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.context.orm.NullOrmAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmBasicMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddableDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddedIdMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddedMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEntityDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmIdMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmManyToManyMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmManyToOneMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmMappedSuperclassDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOneToManyMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmTransientMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmVersionMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-
-public abstract class AbstractEclipseLinkOrmXmlDefinition
-	extends AbstractOrmXmlDefinition
-{
-	protected AbstractEclipseLinkOrmXmlDefinition() {
-		super();
-	}
-
-	public EFactory getResourceNodeFactory() {
-		return EclipseLinkOrmFactory.eINSTANCE;
-	}
-
-	@Override
-	protected OrmXmlContextNodeFactory buildContextNodeFactory() {
-		return new EclipseLinkOrmXmlContextNodeFactory();
-	}
-
-	@Override
-	protected void addTypeMappingDefinitionsTo(ArrayList<OrmTypeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, TYPE_MAPPING_DEFINITIONS);
-	}
-
-	/**
-	 * Order should not matter here; but we'll use the same order as for Java.
-	 * @see EclipseLinkJpaPlatformProvider
-	 */
-	protected static final OrmTypeMappingDefinition[] TYPE_MAPPING_DEFINITIONS = new OrmTypeMappingDefinition[] {
-		OrmEntityDefinition.instance(),
-		OrmEmbeddableDefinition.instance(),
-		OrmMappedSuperclassDefinition.instance()
-	};
-
-	@Override
-	protected void addAttributeMappingDefinitionsTo(ArrayList<OrmAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	/**
-	 * Order should not matter here; but we'll use the same order as for Java.
-	 * @see EclipseLinkJpaPlatformProvider
-	 */
-	protected static final OrmAttributeMappingDefinition[] ATTRIBUTE_MAPPING_DEFINITIONS = new OrmAttributeMappingDefinition[] {
-		OrmTransientMappingDefinition.instance(),
-		OrmEclipseLinkBasicCollectionMappingDefinition.instance(),
-		OrmEclipseLinkBasicMapMappingDefinition.instance(),
-		OrmIdMappingDefinition.instance(),
-		OrmVersionMappingDefinition.instance(),
-		OrmBasicMappingDefinition.instance(),
-		OrmEmbeddedMappingDefinition.instance(),
-		OrmEmbeddedIdMappingDefinition.instance(),
-		OrmEclipseLinkTransformationMappingDefinition.instance(),
-		OrmManyToManyMappingDefinition.instance(),
-		OrmManyToOneMappingDefinition.instance(),
-		OrmOneToManyMappingDefinition.instance(),
-		OrmOneToOneMappingDefinition.instance(),
-		OrmEclipseLinkVariableOneToOneMappingDefinition.instance(),
-		NullOrmAttributeMappingDefinition.instance()
-	};
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicCollectionMapping.java
deleted file mode 100644
index 962339cc9f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicCollectionMapping.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField;
-import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection;
-
-public abstract class AbstractOrmEclipseLinkBasicCollectionMapping
-	extends AbstractOrmAttributeMapping<XmlBasicCollection> 
-	implements EclipseLinkBasicCollectionMapping
-{
-	protected AbstractOrmEclipseLinkBasicCollectionMapping(OrmPersistentAttribute parent, XmlBasicCollection xmlMapping) {
-		super(parent, xmlMapping);
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public void addXmlAttributeMappingTo(org.eclipse.jpt.jpa.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getBasicCollections().add(this.xmlAttributeMapping);
-	}
-	
-	public void removeXmlAttributeMappingFrom(org.eclipse.jpt.jpa.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getBasicCollections().remove(this.xmlAttributeMapping);
-	}
-
-	public int getXmlSequence() {
-		return 23;
-	}
-
-
-	// ********** metamodel **********  
-	@Override
-	protected String getMetamodelFieldTypeName() {
-		return ((PersistentAttribute2_0) getPersistentAttribute()).getMetamodelContainerFieldTypeName();
-	}
-
-	@Override
-	public String getMetamodelTypeName() {
-		String targetTypeName = null;
-		JavaPersistentAttribute javaPersistentAttribute = getJavaPersistentAttribute();
-		if (javaPersistentAttribute != null) {
-			targetTypeName = javaPersistentAttribute.getMultiReferenceTargetTypeName();
-		}
-		return (targetTypeName != null) ? targetTypeName : MetamodelField.DEFAULT_TYPE_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicMapMapping.java
deleted file mode 100644
index 2a7bf337c8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicMapMapping.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.ArrayList;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField;
-import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap;
-
-public abstract class AbstractOrmEclipseLinkBasicMapMapping
-	extends AbstractOrmAttributeMapping<XmlBasicMap> 
-	implements EclipseLinkBasicMapMapping
-{
-	protected AbstractOrmEclipseLinkBasicMapMapping(OrmPersistentAttribute parent, XmlBasicMap xmlMapping) {
-		super(parent, xmlMapping);
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public void addXmlAttributeMappingTo(org.eclipse.jpt.jpa.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getBasicMaps().add(this.xmlAttributeMapping);
-	}
-	
-	public void removeXmlAttributeMappingFrom(org.eclipse.jpt.jpa.core.resource.orm.Attributes resourceAttributes) {
-		((Attributes) resourceAttributes).getBasicMaps().remove(this.xmlAttributeMapping);
-	}
-
-	
-	public int getXmlSequence() {
-		return 27;
-	}
-
-
-	// ********** metamodel **********  
-	@Override
-	protected String getMetamodelFieldTypeName() {
-		return ((PersistentAttribute2_0) getPersistentAttribute()).getMetamodelContainerFieldTypeName();
-	}
-
-	@Override
-	public String getMetamodelTypeName() {
-		String targetTypeName = null;
-		JavaPersistentAttribute javaPersistentAttribute = getJavaPersistentAttribute();
-		if (javaPersistentAttribute != null) {
-			targetTypeName = javaPersistentAttribute.getMultiReferenceTargetTypeName();
-		}
-		return (targetTypeName != null) ? targetTypeName : MetamodelField.DEFAULT_TYPE_NAME;
-	}
-
-	@Override
-	protected void addMetamodelFieldTypeArgumentNamesTo(ArrayList<String> typeArgumentNames) {
-		this.addMetamodelFieldMapKeyTypeArgumentNameTo(typeArgumentNames);
-		super.addMetamodelFieldTypeArgumentNamesTo(typeArgumentNames);
-	}
-
-	protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) {
-		String mapKeyTypeName = null;
-		JavaPersistentAttribute javaPersistentAttribute = getJavaPersistentAttribute();
-		if (javaPersistentAttribute != null) {
-			mapKeyTypeName = javaPersistentAttribute.getMultiReferenceMapKeyTypeName();
-		}
-		mapKeyTypeName = mapKeyTypeName != null ? mapKeyTypeName : MetamodelField.DEFAULT_TYPE_NAME;
-		typeArgumentNames.add(mapKeyTypeName);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
deleted file mode 100644
index 65ff0ae79f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXml;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractEntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkEntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkEntityMappingsImpl
-	extends AbstractEntityMappings
-	implements EclipseLinkEntityMappings
-{
-	protected final OrmEclipseLinkConverterContainer converterContainer;
-
-
-	public EclipseLinkEntityMappingsImpl(OrmXml parent, XmlEntityMappings resource) {
-		super(parent, resource);
-		this.converterContainer = this.buildConverterContainer();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.converterContainer.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.converterContainer.update();
-	}
-
-
-	// ********** converter container **********
-
-	public OrmEclipseLinkConverterContainer getConverterContainer() {
-		return this.converterContainer;
-	}
-
-	protected OrmEclipseLinkConverterContainer buildConverterContainer() {
-		return new OrmEclipseLinkConverterContainerImpl(this, (XmlEntityMappings) this.xmlEntityMappings);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterable<EclipseLinkConverter> getMappingFileConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(
-					this.converterContainer.getConverters(),
-					this.getTypeMappingConverters()
-				);
-	}
-
-	protected Iterable<EclipseLinkConverter> getTypeMappingConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(this.getTypeMappingConverterLists());
-	}
-
-	protected Iterable<Iterable<EclipseLinkConverter>> getTypeMappingConverterLists() {
-		return new TransformationIterable<OrmTypeMapping, Iterable<EclipseLinkConverter>>(this.getTypeMappings()) {
-					@Override
-					protected Iterable<EclipseLinkConverter> transform(OrmTypeMapping typeMapping) {
-						return ((EclipseLinkTypeMapping) typeMapping).getConverters();
-					}
-				};
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	protected IContentType getContentType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
-	}
-
-
-	// ********** refactoring **********
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			super.createRenameTypeEdits(originalType, newName),
-			this.createConverterRenameTypeEdits(originalType, newName));
-	}
-
-	protected Iterable<ReplaceEdit> createConverterRenameTypeEdits(IType originalType, String newName) {
-		return this.converterContainer.createRenameTypeEdits(originalType, newName);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-			super.createMoveTypeEdits(originalType, newPackage),
-			this.createConverterMoveTypeEdits(originalType, newPackage));
-	}
-
-	protected Iterable<ReplaceEdit> createConverterMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			super.createRenamePackageEdits(originalPackage, newName),
-			this.createConverterRenamePackageEdits(originalPackage, newName));
-	}
-
-	protected Iterable<ReplaceEdit> createConverterRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.converterContainer.validate(messages, reporter);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyRelationship.java
deleted file mode 100644
index ab00aa20ec..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyRelationship.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.jpa.core.internal.context.orm.GenericOrmOneToManyRelationship;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.orm.EclipseLinkOrmOneToManyRelationship2_0;
-
-/**
- * We need this class because the EclipseLink 1.0 1:m mapping supports a join
- * column strategy while JPA did not until JPA 2.0. As a result, we need a class
- * that implements EclipseLink 1.0.
- */
-public class EclipseLinkOrmOneToManyRelationship
-	extends GenericOrmOneToManyRelationship
-	implements EclipseLinkOrmOneToManyRelationship2_0
-{
-	public EclipseLinkOrmOneToManyRelationship(OrmOneToManyMapping parent) {
-		super(parent, true);  // true=supports join column strategy
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTimeOfDay.java
deleted file mode 100644
index 046fd56243..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTimeOfDay.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTimeOfDay;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay;
-
-public class EclipseLinkOrmTimeOfDay
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkTimeOfDay
-{
-	protected final XmlTimeOfDay xmlTimeOfDay;
-
-	protected Integer hour;
-	protected Integer minute;
-	protected Integer second;
-	protected Integer millisecond;
-
-
-	public EclipseLinkOrmTimeOfDay(OrmEclipseLinkCaching parent, XmlTimeOfDay xmlTimeOfDay) {
-		super(parent);
-		this.xmlTimeOfDay = xmlTimeOfDay;
-		this.hour = xmlTimeOfDay.getHour();
-		this.minute = xmlTimeOfDay.getMinute();
-		this.second = xmlTimeOfDay.getSecond();
-		this.millisecond = xmlTimeOfDay.getMillisecond();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setHour_(this.xmlTimeOfDay.getHour());
-		this.setMinute_(this.xmlTimeOfDay.getMinute());
-		this.setSecond_(this.xmlTimeOfDay.getSecond());
-		this.setMillisecond_(this.xmlTimeOfDay.getMillisecond());
-	}
-
-
-	// ********** hour **********
-
-	public Integer getHour() {
-		return this.hour;
-	}
-
-	public void setHour(Integer hour) {
-		this.setHour_(hour);
-		this.xmlTimeOfDay.setHour(hour);
-	}
-
-	protected void setHour_(Integer hour) {
-		Integer old = this.hour;
-		this.hour = hour;
-		this.firePropertyChanged(HOUR_PROPERTY, old, hour);
-	}
-
-
-	// ********** minute **********
-
-	public Integer getMinute() {
-		return this.minute;
-	}
-
-	public void setMinute(Integer minute) {
-		this.setMinute_(minute);
-		this.xmlTimeOfDay.setMinute(minute);
-	}
-
-	protected void setMinute_(Integer minute) {
-		Integer old = this.minute;
-		this.minute = minute;
-		this.firePropertyChanged(MINUTE_PROPERTY, old, minute);
-	}
-
-
-	// ********** second **********
-
-	public Integer getSecond() {
-		return this.second;
-	}
-
-	public void setSecond(Integer second) {
-		this.setSecond_(second);
-		this.xmlTimeOfDay.setSecond(second);
-	}
-
-	protected void setSecond_(Integer second) {
-		Integer old = this.second;
-		this.second = second;
-		this.firePropertyChanged(SECOND_PROPERTY, old, second);
-	}
-
-
-	// ********** millisecond **********
-
-	public Integer getMillisecond() {
-		return this.millisecond;
-	}
-
-	public void setMillisecond(Integer millisecond) {
-		this.setMillisecond_(millisecond);
-		this.xmlTimeOfDay.setMillisecond(millisecond);
-	}
-
-	protected void setMillisecond_(Integer millisecond) {
-		Integer old = this.millisecond;
-		this.millisecond = millisecond;
-		this.firePropertyChanged(MILLISECOND_PROPERTY, old, millisecond);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public OrmEclipseLinkCaching getParent() {
-		return (OrmEclipseLinkCaching) super.getParent();
-	}
-
-	protected OrmEclipseLinkCaching getCaching() {
-		return this.getParent();
-	}
-
-	public XmlTimeOfDay getXmlTimeOfDay() {
-		return this.xmlTimeOfDay;
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.xmlTimeOfDay.getValidationTextRange();
-		return (textRange != null) ? textRange : this.getCaching().getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextNodeFactory.java
deleted file mode 100644
index 07a39fb222..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextNodeFactory.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
-import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitDefaults;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitMetadata;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXml;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion;
-
-public class EclipseLinkOrmXmlContextNodeFactory
-	extends AbstractOrmXmlContextNodeFactory
-{	
-
-	// ********** EclipseLink-specific ORM Context Model **********
-	
-	@Override
-	public EntityMappings buildEntityMappings(OrmXml parent, org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings xmlEntityMappings) {
-		return new EclipseLinkEntityMappingsImpl(parent, (XmlEntityMappings) xmlEntityMappings);
-	}
-	
-	@Override
-	public OrmPersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping resourceMapping) {
-		return new OrmEclipseLinkPersistentAttribute(parent, resourceMapping);
-	}
-
-	@Override
-	public OrmEmbeddable buildOrmEmbeddable(OrmPersistentType type, org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable resourceMapping) {
-		return new OrmEclipseLinkEmbeddableImpl(type, (XmlEmbeddable) resourceMapping);
-	}
-
-	@Override
-	public OrmEntity buildOrmEntity(OrmPersistentType type, org.eclipse.jpt.jpa.core.resource.orm.XmlEntity resourceMapping) {
-		return new OrmEclipseLinkEntityImpl(type, (XmlEntity) resourceMapping);
-	}
-	
-	@Override
-	public OrmMappedSuperclass buildOrmMappedSuperclass(OrmPersistentType type, org.eclipse.jpt.jpa.core.resource.orm.XmlMappedSuperclass resourceMapping) {
-		return new OrmEclipseLinkMappedSuperclassImpl(type, (XmlMappedSuperclass) resourceMapping);
-	}
-	
-	@Override
-	public OrmBasicMapping buildOrmBasicMapping(OrmPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlBasic resourceMapping) {
-		return new OrmEclipseLinkBasicMapping(parent, (XmlBasic) resourceMapping);
-	}
-	
-	@Override
-	public OrmIdMapping buildOrmIdMapping(OrmPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlId resourceMapping) {
-		return new OrmEclipseLinkIdMapping(parent, (XmlId) resourceMapping);
-	}
-	
-	@Override
-	public OrmManyToManyMapping buildOrmManyToManyMapping(OrmPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany resourceMapping) {
-		return new OrmEclipseLinkManyToManyMapping(parent, (XmlManyToMany) resourceMapping);
-	}
-	
-	@Override
-	public OrmManyToOneMapping buildOrmManyToOneMapping(OrmPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne resourceMapping) {
-		return new OrmEclipseLinkManyToOneMapping(parent, (XmlManyToOne) resourceMapping);
-	}
-	
-	@Override
-	public OrmOneToManyMapping buildOrmOneToManyMapping(OrmPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany resourceMapping) {
-		return new OrmEclipseLinkOneToManyMapping(parent, (XmlOneToMany) resourceMapping);
-	}
-	
-	@Override
-	public OrmOneToOneMapping buildOrmOneToOneMapping(OrmPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne resourceMapping) {
-		return new OrmEclipseLinkOneToOneMapping(parent, (XmlOneToOne) resourceMapping);
-	}
-	
-	@Override
-	public OrmVersionMapping buildOrmVersionMapping(OrmPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlVersion resourceMapping) {
-		return new OrmEclipseLinkVersionMapping(parent, (XmlVersion) resourceMapping);
-	}
-	
-	public AbstractOrmEclipseLinkBasicCollectionMapping buildOrmEclipseLinkBasicCollectionMapping(OrmPersistentAttribute parent, XmlBasicCollection resourceMapping) {
-		return new OrmEclipseLinkBasicCollectionMapping(parent, resourceMapping);
-	}
-	
-	public AbstractOrmEclipseLinkBasicMapMapping buildOrmEclipseLinkBasicMapMapping(OrmPersistentAttribute parent, XmlBasicMap resourceMapping) {
-		return new OrmEclipseLinkBasicMapMapping(parent, resourceMapping);
-	}
-	
-	public OrmEclipseLinkTransformationMapping buildOrmEclipseLinkTransformationMapping(OrmPersistentAttribute parent, XmlTransformation resourceMapping) {
-		return new OrmEclipseLinkTransformationMapping(parent, resourceMapping);
-	}
-	
-	public OrmEclipseLinkVariableOneToOneMapping buildOrmEclipseLinkVariableOneToOneMapping(OrmPersistentAttribute parent, XmlVariableOneToOne resourceMapping) {
-		return new OrmEclipseLinkVariableOneToOneMapping(parent, resourceMapping);
-	}
-
-	@Override
-	public OrmPersistenceUnitDefaults buildOrmPersistenceUnitDefaults(OrmPersistenceUnitMetadata parent) {
-		return new OrmEclipseLinkPersistenceUnitDefaults(parent);
-	}
-
-	@Override
-	public OrmPersistenceUnitMetadata buildOrmPersistenceUnitMetadata(EntityMappings parent) {
-		return new OrmEclipseLinkPersistenceUnitMetadata(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlDefinition.java
deleted file mode 100644
index 2ee432fa2b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlDefinition.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-
-public class EclipseLinkOrmXmlDefinition
-	extends AbstractEclipseLinkOrmXmlDefinition
-{
-	// singleton
-	private static final OrmXmlDefinition INSTANCE = new EclipseLinkOrmXmlDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmXmlDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkOrmXmlDefinition() {
-		super();
-	}
-
-	public JptResourceType getResourceType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_1_0_RESOURCE_TYPE;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping.java
deleted file mode 100644
index c12804c92d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection;
-
-public class OrmEclipseLinkBasicCollectionMapping
-	extends AbstractOrmEclipseLinkBasicCollectionMapping
-{
-	public OrmEclipseLinkBasicCollectionMapping(OrmPersistentAttribute parent, XmlBasicCollection xmlMapping) {
-		super(parent, xmlMapping);
-	}
-}
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
deleted file mode 100644
index 25b2416257..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.ecore.EFactory;
-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;
-
-public class OrmEclipseLinkBasicCollectionMappingDefinition
-	implements OrmAttributeMappingDefinition
-{
-	// singleton
-	private static final OrmEclipseLinkBasicCollectionMappingDefinition INSTANCE = 
-			new OrmEclipseLinkBasicCollectionMappingDefinition();
-	
-	
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private OrmEclipseLinkBasicCollectionMappingDefinition() {
-		super();
-	}
-	
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping(EFactory factory) {
-		return EmfTools.create(
-				factory, 
-				EclipseLinkOrmPackage.eINSTANCE.getXmlBasicCollection(), 
-				XmlBasicCollection.class);
-	}
-	
-	public OrmAttributeMapping buildContextMapping(
-			OrmPersistentAttribute parent, 
-			XmlAttributeMapping resourceMapping, 
-			OrmXmlContextNodeFactory factory) {
-		return ((EclipseLinkOrmXmlContextNodeFactory) factory).
-				buildOrmEclipseLinkBasicCollectionMapping(parent, (XmlBasicCollection) resourceMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping.java
deleted file mode 100644
index b968528b6c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap;
-
-public class OrmEclipseLinkBasicMapMapping
-	extends AbstractOrmEclipseLinkBasicMapMapping
-{
-	public OrmEclipseLinkBasicMapMapping(OrmPersistentAttribute parent, XmlBasicMap xmlMapping) {
-		super(parent, xmlMapping);
-	}
-}
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
deleted file mode 100644
index 5130e023ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.ecore.EFactory;
-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;
-
-public class OrmEclipseLinkBasicMapMappingDefinition
-	implements OrmAttributeMappingDefinition
-{
-	// singleton
-	private static final OrmEclipseLinkBasicMapMappingDefinition INSTANCE = 
-			new OrmEclipseLinkBasicMapMappingDefinition();
-	
-	
-	/**
-	 * Return the singleton
-	 */
-	public static OrmAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Ensforce singleton usage
-	 */
-	private OrmEclipseLinkBasicMapMappingDefinition() {
-		super();
-	}
-	
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping(EFactory factory) {
-		return EmfTools.create(
-				factory, 
-				EclipseLinkOrmPackage.eINSTANCE.getXmlBasicMap(), 
-				XmlBasicMap.class);
-	}
-	
-	public OrmAttributeMapping buildContextMapping(
-			OrmPersistentAttribute parent, 
-			XmlAttributeMapping resourceMapping, 
-			OrmXmlContextNodeFactory factory) {
-		return ((EclipseLinkOrmXmlContextNodeFactory) factory).
-				buildOrmEclipseLinkBasicMapMapping(parent, (XmlBasicMap) resourceMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java
deleted file mode 100644
index c43844d42d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmConverter;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmBasicMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkBasicMapping
-	extends AbstractOrmBasicMapping<XmlBasic>
-	implements EclipseLinkBasicMapping
-{
-	protected final OrmEclipseLinkMutable mutable;
-
-
-	public OrmEclipseLinkBasicMapping(OrmPersistentAttribute parent, XmlBasic xmlMapping) {
-		super(parent, xmlMapping);
-		this.mutable = new OrmEclipseLinkMutable(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.mutable.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-
-
-	// ********** mutable **********
-
-	public EclipseLinkMutable getMutable() {
-		return this.mutable;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * put the EclipseLink convert adapter first - this is the order EclipseLink searches
-	 */
-	@Override
-	protected Iterable<OrmConverter.Adapter> getConverterAdapters() {
-		return new CompositeIterable<OrmConverter.Adapter>(
-				OrmEclipseLinkConvert.Adapter.instance(),
-				super.getConverterAdapters()
-			);
-	}
-
-
-	// ********** validation **********
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO mutable validation
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCachingImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCachingImpl.java
deleted file mode 100644
index c2be3d6b71..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCachingImpl.java
+++ /dev/null
@@ -1,751 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.TypeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.NullOrmCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.CacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCacheable_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCacheCoordinationType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCacheType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkExistenceType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTimeOfDay;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkNonEmbeddableTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkNonEmbeddableTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay;
-
-public class OrmEclipseLinkCachingImpl
-	extends AbstractOrmXmlContextNode
-	implements OrmEclipseLinkCaching, OrmCacheableHolder2_0
-{
-	protected EclipseLinkCacheType specifiedType;
-	protected EclipseLinkCacheType defaultType;
-
-	protected Integer specifiedSize;
-	protected int defaultSize;
-
-	protected Boolean specifiedShared;
-	protected boolean defaultShared;
-
-	protected Boolean specifiedAlwaysRefresh;
-	protected boolean defaultAlwaysRefresh;
-
-	protected Boolean specifiedRefreshOnlyIfNewer;
-	protected boolean defaultRefreshOnlyIfNewer;
-
-	protected Boolean specifiedDisableHits;
-	protected boolean defaultDisableHits;
-
-	protected EclipseLinkCacheCoordinationType specifiedCoordinationType;
-	protected EclipseLinkCacheCoordinationType defaultCoordinationType;
-
-	protected Integer expiry;
-	protected EclipseLinkOrmTimeOfDay expiryTimeOfDay;
-
-	protected EclipseLinkExistenceType specifiedExistenceType;
-	protected EclipseLinkExistenceType defaultExistenceType;
-
-	protected final OrmCacheable2_0 cacheable;
-
-
-	public OrmEclipseLinkCachingImpl(OrmEclipseLinkNonEmbeddableTypeMapping parent) {
-		super(parent);
-
-		this.specifiedType = this.buildSpecifiedType();
-		this.specifiedSize = this.buildSpecifiedSize();
-		this.specifiedShared = this.buildSpecifiedShared();
-		this.specifiedAlwaysRefresh = this.buildSpecifiedAlwaysRefresh();
-		this.specifiedRefreshOnlyIfNewer = this.buildSpecifiedRefreshOnlyIfNewer();
-		this.specifiedDisableHits = this.buildSpecifiedDisableHits();
-
-		this.specifiedCoordinationType = this.buildSpecifiedCoordinationType();
-
-		this.expiry = this.buildExpiry();
-		this.expiryTimeOfDay = this.buildExpiryTimeOfDay();
-
-		this.specifiedExistenceType = this.buildSpecifiedExistenceType();
-
-		this.cacheable = this.buildCacheable();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-
-		this.setSpecifiedType_(this.buildSpecifiedType());
-		this.setSpecifiedSize_(this.buildSpecifiedSize());
-		this.setSpecifiedShared_(this.buildSpecifiedShared());
-		this.setSpecifiedAlwaysRefresh_(this.buildSpecifiedAlwaysRefresh());
-		this.setSpecifiedRefreshOnlyIfNewer_(this.buildSpecifiedRefreshOnlyIfNewer());
-		this.setSpecifiedDisableHits_(this.buildSpecifiedDisableHits());
-
-		this.setSpecifiedCoordinationType_(this.buildSpecifiedCoordinationType());
-
-		this.setExpiry_(this.buildExpiry());
-		this.syncExpiryTimeOfDay();
-
-		this.setSpecifiedExistenceType_(this.buildSpecifiedExistenceType());
-
-		this.cacheable.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-
-		boolean xmlCacheNotSpecified = (this.getXmlCache() == null);
-		JavaEclipseLinkCaching javaCaching = this.getJavaCachingForDefaults();
-		boolean javaCacheSpecified = (javaCaching != null);
-		boolean useJavaValue = (xmlCacheNotSpecified && javaCacheSpecified);
-
-		this.setDefaultType(useJavaValue ? javaCaching.getType() : DEFAULT_TYPE);
-		this.setDefaultSize(useJavaValue ? javaCaching.getSize() : DEFAULT_SIZE);
-		this.setDefaultShared(useJavaValue ? javaCaching.isShared() : DEFAULT_SHARED);
-		this.setDefaultAlwaysRefresh(useJavaValue ? javaCaching.isAlwaysRefresh() : DEFAULT_ALWAYS_REFRESH);
-		this.setDefaultRefreshOnlyIfNewer(useJavaValue ? javaCaching.isRefreshOnlyIfNewer() : DEFAULT_REFRESH_ONLY_IF_NEWER);
-		this.setDefaultDisableHits(useJavaValue ? javaCaching.isDisableHits() : DEFAULT_DISABLE_HITS);
-
-		this.setDefaultCoordinationType(useJavaValue ? javaCaching.getCoordinationType() : DEFAULT_COORDINATION_TYPE);
-
-		if (this.expiryTimeOfDay != null) {
-			this.expiryTimeOfDay.update();
-		}
-
-		// existence checking is its own xml attribute, it is not part of the cache xml element
-		this.setDefaultExistenceType(javaCacheSpecified ? javaCaching.getExistenceType() : DEFAULT_EXISTENCE_TYPE);
-
-		this.cacheable.update();
-	}
-
-
-	// ********** type **********
-
-	public EclipseLinkCacheType getType() {
-		return (this.specifiedType != null) ? this.specifiedType : this.defaultType;
-	}
-
-	public EclipseLinkCacheType getSpecifiedType() {
-		return this.specifiedType;
-	}
-
-	public void setSpecifiedType(EclipseLinkCacheType type) {
-		if (this.valuesAreDifferent(this.specifiedType, type)) {
-			XmlCache xmlCache = this.getXmlCacheForUpdate();
-			this.setSpecifiedType_(type);
-			xmlCache.setType(EclipseLinkCacheType.toOrmResourceModel(type));
-			this.removeXmlCacheIfUnset();
-		}
-
-		if (type != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedType_(EclipseLinkCacheType type) {
-		EclipseLinkCacheType old = this.specifiedType;
-		this.specifiedType = type;
-		this.firePropertyChanged(SPECIFIED_TYPE_PROPERTY, old, type);
-	}
-
-	protected EclipseLinkCacheType buildSpecifiedType() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : EclipseLinkCacheType.fromOrmResourceModel(xmlCache.getType());
-	}
-
-	public EclipseLinkCacheType getDefaultType() {
-		String puDefaultCacheTypeName = ((EclipseLinkPersistenceUnit)getPersistenceUnit()).getDefaultCacheTypePropertyValue();
-		if (!StringTools.stringIsEmpty(puDefaultCacheTypeName)) {
-			try { 
-				return EclipseLinkCacheType.valueOf(StringTools.convertCamelCaseToAllCaps(puDefaultCacheTypeName));
-			} catch (IllegalArgumentException exception) {
-				//no match, return default
-			}
-		}
-		return this.defaultType;
-	}
-
-	protected void setDefaultType(EclipseLinkCacheType type) {
-		EclipseLinkCacheType old = this.defaultType;
-		this.defaultType = type;
-		this.firePropertyChanged(DEFAULT_TYPE_PROPERTY, old, type);
-	}
-
-
-	// ********** size **********
-
-	public int getSize() {
-		return (this.specifiedSize != null) ? this.specifiedSize.intValue() : this.defaultSize;
-	}
-
-	public Integer getSpecifiedSize() {
-		return this.specifiedSize;
-	}
-
-	public void setSpecifiedSize(Integer size) {
-		if (this.valuesAreDifferent(this.specifiedSize, size)) {
-			XmlCache xmlCache = this.getXmlCacheForUpdate();
-			this.setSpecifiedSize_(size);
-			xmlCache.setSize(size);
-			this.removeXmlCacheIfUnset();
-		}
-
-		if (size != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedSize_(Integer size) {
-		Integer old = this.specifiedSize;
-		this.specifiedSize = size;
-		this.firePropertyChanged(SPECIFIED_SIZE_PROPERTY, old, size);
-	}
-
-	protected Integer buildSpecifiedSize() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : xmlCache.getSize();
-	}
-
-	public int getDefaultSize() {
-		String puDefaultCacheSize = ((EclipseLinkPersistenceUnit)getPersistenceUnit()).getDefaultCacheSizePropertyValue();
-		if (!StringTools.stringIsEmpty(puDefaultCacheSize)) {
-			try {
-				return Integer.valueOf(puDefaultCacheSize).intValue();
-			} catch (NumberFormatException exception) {
-				//couldn't parse, return default
-			}
-		}
-		return this.defaultSize;
-	}
-
-	protected void setDefaultSize(int size) {
-		int old = this.defaultSize;
-		this.defaultSize = size;
-		this.firePropertyChanged(DEFAULT_SIZE_PROPERTY, old, size);
-	}
-
-
-	// ********** shared **********
-
-	public boolean isShared() {
-		return (this.specifiedShared != null) ? this.specifiedShared.booleanValue() : this.defaultShared;
-	}
-
-	public Boolean getSpecifiedShared() {
-		return this.specifiedShared;
-	}
-
-	public void setSpecifiedShared(Boolean shared) {
-		if (this.valuesAreDifferent(this.specifiedShared, shared)) {
-			XmlCache xmlCache = this.getXmlCacheForUpdate();
-			this.setSpecifiedShared_(shared);
-			xmlCache.setShared(shared);
-			this.removeXmlCacheIfUnset();
-		}
-
-		if ((shared != null) && ! shared.booleanValue()) {  // Boolean.FALSE
-			this.setSpecifiedType(null);
-			this.setSpecifiedSize(null);
-			this.setSpecifiedAlwaysRefresh(null);
-			this.setSpecifiedRefreshOnlyIfNewer(null);
-			this.setSpecifiedDisableHits(null);
-			this.setSpecifiedCoordinationType(null);
-			this.setExpiry(null);
-			this.removeExpiryTimeOfDayIfNecessary();
-		}
-	}
-
-	protected void setSpecifiedShared_(Boolean shared) {
-		Boolean old = this.specifiedShared;
-		this.specifiedShared = shared;
-		this.firePropertyChanged(SPECIFIED_SHARED_PROPERTY, old, shared);
-	}
-
-	protected Boolean buildSpecifiedShared() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : xmlCache.getShared();
-	}
-
-	public boolean isDefaultShared() {
-		String puDefaultSharedCache = ((EclipseLinkPersistenceUnit)getPersistenceUnit()).getDefaultCacheSharedPropertyValue();
-		return !StringTools.stringIsEmpty(puDefaultSharedCache) ? Boolean.valueOf(puDefaultSharedCache) : this.defaultShared;
-	}
-
-	protected void setDefaultShared(boolean shared) {
-		boolean old = this.defaultShared;
-		this.defaultShared = shared;
-		this.firePropertyChanged(DEFAULT_SHARED_PROPERTY, old, shared);
-	}
-
-
-	// ********** always refresh **********
-
-	public boolean isAlwaysRefresh() {
-		return (this.specifiedAlwaysRefresh != null) ? this.specifiedAlwaysRefresh.booleanValue() : this.defaultAlwaysRefresh;
-	}
-
-	public Boolean getSpecifiedAlwaysRefresh() {
-		return this.specifiedAlwaysRefresh;
-	}
-
-	public void setSpecifiedAlwaysRefresh(Boolean alwaysRefresh) {
-		if (this.valuesAreDifferent(this.specifiedAlwaysRefresh, alwaysRefresh)) {
-			XmlCache xmlCache = this.getXmlCacheForUpdate();
-			this.setSpecifiedAlwaysRefresh_(alwaysRefresh);
-			xmlCache.setAlwaysRefresh(alwaysRefresh);
-			this.removeXmlCacheIfUnset();
-		}
-
-		if (alwaysRefresh != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedAlwaysRefresh_(Boolean alwaysRefresh) {
-		Boolean old = this.specifiedAlwaysRefresh;
-		this.specifiedAlwaysRefresh = alwaysRefresh;
-		this.firePropertyChanged(SPECIFIED_ALWAYS_REFRESH_PROPERTY, old, alwaysRefresh);
-	}
-
-	protected Boolean buildSpecifiedAlwaysRefresh() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : xmlCache.getAlwaysRefresh();
-	}
-
-	public boolean isDefaultAlwaysRefresh() {
-		return this.defaultAlwaysRefresh;
-	}
-
-	protected void setDefaultAlwaysRefresh(boolean alwaysRefresh) {
-		boolean old = this.defaultAlwaysRefresh;
-		this.defaultAlwaysRefresh = alwaysRefresh;
-		this.firePropertyChanged(DEFAULT_ALWAYS_REFRESH_PROPERTY, old, alwaysRefresh);
-	}
-
-
-	// ********** refresh only if newer **********
-
-	public boolean isRefreshOnlyIfNewer() {
-		return (this.specifiedRefreshOnlyIfNewer != null) ? this.specifiedRefreshOnlyIfNewer.booleanValue() : this.defaultRefreshOnlyIfNewer;
-	}
-
-	public Boolean getSpecifiedRefreshOnlyIfNewer() {
-		return this.specifiedRefreshOnlyIfNewer;
-	}
-
-	public void setSpecifiedRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer) {
-		if (this.valuesAreDifferent(this.specifiedRefreshOnlyIfNewer, refreshOnlyIfNewer)) {
-			XmlCache xmlCache = this.getXmlCacheForUpdate();
-			this.setSpecifiedRefreshOnlyIfNewer_(refreshOnlyIfNewer);
-			xmlCache.setRefreshOnlyIfNewer(refreshOnlyIfNewer);
-			this.removeXmlCacheIfUnset();
-		}
-
-		if (refreshOnlyIfNewer != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedRefreshOnlyIfNewer_(Boolean refreshOnlyIfNewer) {
-		Boolean old = this.specifiedRefreshOnlyIfNewer;
-		this.specifiedRefreshOnlyIfNewer = refreshOnlyIfNewer;
-		this.firePropertyChanged(SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY, old, refreshOnlyIfNewer);
-	}
-
-	protected Boolean buildSpecifiedRefreshOnlyIfNewer() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : xmlCache.getRefreshOnlyIfNewer();
-	}
-
-	public boolean isDefaultRefreshOnlyIfNewer() {
-		return this.defaultRefreshOnlyIfNewer;
-	}
-
-	protected void setDefaultRefreshOnlyIfNewer(boolean refreshOnlyIfNewer) {
-		boolean old = this.defaultRefreshOnlyIfNewer;
-		this.defaultRefreshOnlyIfNewer = refreshOnlyIfNewer;
-		this.firePropertyChanged(DEFAULT_REFRESH_ONLY_IF_NEWER_PROPERTY, old, refreshOnlyIfNewer);
-	}
-
-
-	// ********** disable hits **********
-
-	public boolean isDisableHits() {
-		return (this.specifiedDisableHits != null) ? this.specifiedDisableHits.booleanValue() : this.defaultDisableHits;
-	}
-
-	public Boolean getSpecifiedDisableHits() {
-		return this.specifiedDisableHits;
-	}
-
-	public void setSpecifiedDisableHits(Boolean disableHits) {
-		if (this.valuesAreDifferent(this.specifiedDisableHits, disableHits)) {
-			XmlCache xmlCache = this.getXmlCacheForUpdate();
-			this.setSpecifiedDisableHits_(disableHits);
-			xmlCache.setDisableHits(disableHits);
-			this.removeXmlCacheIfUnset();
-		}
-
-		if (disableHits != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedDisableHits_(Boolean disableHits) {
-		Boolean old = this.specifiedDisableHits;
-		this.specifiedDisableHits = disableHits;
-		this.firePropertyChanged(SPECIFIED_DISABLE_HITS_PROPERTY, old, disableHits);
-	}
-
-	protected Boolean buildSpecifiedDisableHits() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : xmlCache.getDisableHits();
-	}
-
-	public boolean isDefaultDisableHits() {
-		return this.defaultDisableHits;
-	}
-
-	protected void setDefaultDisableHits(boolean disableHits) {
-		boolean old = this.defaultDisableHits;
-		this.defaultDisableHits = disableHits;
-		this.firePropertyChanged(DEFAULT_DISABLE_HITS_PROPERTY, old, disableHits);
-	}
-
-
-	// ********** coordination type **********
-
-	public EclipseLinkCacheCoordinationType getCoordinationType() {
-		return (this.specifiedCoordinationType != null) ? this.specifiedCoordinationType : this.defaultCoordinationType;
-	}
-
-	public EclipseLinkCacheCoordinationType getSpecifiedCoordinationType() {
-		return this.specifiedCoordinationType;
-	}
-
-	public void setSpecifiedCoordinationType(EclipseLinkCacheCoordinationType type) {
-		if (this.valuesAreDifferent(this.specifiedCoordinationType, type)) {
-			XmlCache xmlCache = this.getXmlCacheForUpdate();
-			this.setSpecifiedCoordinationType_(type);
-			xmlCache.setCoordinationType(EclipseLinkCacheCoordinationType.toOrmResourceModel(type));
-			this.removeXmlCacheIfUnset();
-		}
-
-		if (type != null) {
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setSpecifiedCoordinationType_(EclipseLinkCacheCoordinationType type) {
-		EclipseLinkCacheCoordinationType old = this.specifiedCoordinationType;
-		this.specifiedCoordinationType = type;
-		this.firePropertyChanged(SPECIFIED_COORDINATION_TYPE_PROPERTY, old, type);
-	}
-
-	protected EclipseLinkCacheCoordinationType buildSpecifiedCoordinationType() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : EclipseLinkCacheCoordinationType.fromOrmResourceModel(xmlCache.getCoordinationType());
-	}
-
-	public EclipseLinkCacheCoordinationType getDefaultCoordinationType() {
-		return this.defaultCoordinationType;
-	}
-
-	protected void setDefaultCoordinationType(EclipseLinkCacheCoordinationType type) {
-		EclipseLinkCacheCoordinationType old= this.defaultCoordinationType;
-		this.defaultCoordinationType = type;
-		this.firePropertyChanged(DEFAULT_COORDINATION_TYPE_PROPERTY, old, type);
-	}
-
-
-	// ********** expiry **********
-
-	public Integer getExpiry() {
-		return this.expiry;
-	}
-
-	public void setExpiry(Integer expiry) {
-		if (this.valuesAreDifferent(this.expiry, expiry)) {
-			XmlCache xmlCache = this.getXmlCacheForUpdate();
-			this.setExpiry_(expiry);
-			xmlCache.setExpiry(expiry);
-			this.removeXmlCacheIfUnset();
-		}
-
-		if (expiry != null) {
-			this.removeExpiryTimeOfDayIfNecessary();
-			this.setSpecifiedShared(null);
-		}
-	}
-
-	protected void setExpiry_(Integer expiry) {
-		Integer old = this.expiry;
-		this.expiry = expiry;
-		this.firePropertyChanged(EXPIRY_PROPERTY, old, expiry);
-	}
-
-	protected Integer buildExpiry() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : xmlCache.getExpiry();
-	}
-
-
-	// ********** expiry time of day **********
-
-	public EclipseLinkTimeOfDay getExpiryTimeOfDay() {
-		return this.expiryTimeOfDay;
-	}
-
-	public EclipseLinkTimeOfDay addExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay != null) {
-			throw new IllegalStateException("expiry time of day already exists: " + this.expiryTimeOfDay); //$NON-NLS-1$
-		}
-
-		XmlCache xmlCache = this.getXmlCacheForUpdate();
-		XmlTimeOfDay xmlTimeOfDay = this.buildXmlTimeOfDay();
-		EclipseLinkOrmTimeOfDay timeOfDay = this.buildExpiryTimeOfDay(xmlTimeOfDay);
-		this.setExpiryTimeOfDay(timeOfDay);
-		xmlCache.setExpiryTimeOfDay(xmlTimeOfDay);
-
-		this.setExpiry(null);
-		this.setSpecifiedShared(null);
-
-		return timeOfDay;
-	}
-
-	protected XmlTimeOfDay buildXmlTimeOfDay() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlTimeOfDay();
-	}
-
-	public void removeExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay == null) {
-			throw new IllegalStateException("expiry time of day does not exist"); //$NON-NLS-1$
-		}
-		this.removeExpiryTimeOfDay_();
-	}
-
-	protected void removeExpiryTimeOfDayIfNecessary() {
-		if (this.expiryTimeOfDay != null) {
-			this.removeExpiryTimeOfDay_();
-		}
-	}
-
-	protected void removeExpiryTimeOfDay_() {
-		this.setExpiryTimeOfDay(null);
-		this.getXmlCache().setExpiryTimeOfDay(null);
-		this.removeXmlCacheIfUnset();
-	}
-
-	protected void setExpiryTimeOfDay(EclipseLinkOrmTimeOfDay timeOfDay) {
-		EclipseLinkOrmTimeOfDay old = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = timeOfDay;
-		this.firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, old, timeOfDay);
-	}
-
-	protected void syncExpiryTimeOfDay() {
-		XmlTimeOfDay xmlTimeOfDay = this.getXmlExpiryTimeOfDay();
-		if (xmlTimeOfDay == null) {
-			if (this.expiryTimeOfDay != null) {
-				this.setExpiryTimeOfDay(null);
-			}
-		} else {
-			if ((this.expiryTimeOfDay != null) && (this.expiryTimeOfDay.getXmlTimeOfDay() == xmlTimeOfDay)) {
-				this.expiryTimeOfDay.synchronizeWithResourceModel();
-			} else {
-				this.setExpiryTimeOfDay(this.buildExpiryTimeOfDay(xmlTimeOfDay));
-			}
-		}
-	}
-
-	protected EclipseLinkOrmTimeOfDay buildExpiryTimeOfDay() {
-		return this.buildExpiryTimeOfDay(this.getXmlExpiryTimeOfDay());
-	}
-
-	protected XmlTimeOfDay getXmlExpiryTimeOfDay() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : xmlCache.getExpiryTimeOfDay();
-	}
-
-	protected EclipseLinkOrmTimeOfDay buildExpiryTimeOfDay(XmlTimeOfDay xmlTimeOfDay) {
-		return (xmlTimeOfDay == null) ? null : new EclipseLinkOrmTimeOfDay(this, xmlTimeOfDay);
-	}
-
-
-	// ********** existence type **********
-
-	public EclipseLinkExistenceType getExistenceType() {
-		return (this.specifiedExistenceType != null) ? this.specifiedExistenceType : this.defaultExistenceType;
-	}
-
-	public EclipseLinkExistenceType getSpecifiedExistenceType() {
-		return this.specifiedExistenceType;
-	}
-
-	public void setSpecifiedExistenceType(EclipseLinkExistenceType type) {
-		if (this.setSpecifiedExistenceType_(type)) {
-			this.getXmlCacheHolder().setExistenceChecking(EclipseLinkExistenceType.toOrmResourceModel(type));
-		}
-	}
-
-	protected boolean setSpecifiedExistenceType_(EclipseLinkExistenceType type) {
-		EclipseLinkExistenceType old = this.specifiedExistenceType;
-		this.specifiedExistenceType = type;
-		return this.firePropertyChanged(SPECIFIED_EXISTENCE_TYPE_PROPERTY, old, type);
-	}
-
-	protected EclipseLinkExistenceType buildSpecifiedExistenceType() {
-		XmlCacheHolder xmlCacheHolder = this.getXmlCacheHolder();
-		return (xmlCacheHolder == null) ? null : EclipseLinkExistenceType.fromOrmResourceModel(xmlCacheHolder.getExistenceChecking());
-	}
-
-	public EclipseLinkExistenceType getDefaultExistenceType() {
-		return this.defaultExistenceType;
-	}
-
-	protected void setDefaultExistenceType(EclipseLinkExistenceType type) {
-		EclipseLinkExistenceType old = this.defaultExistenceType;
-		this.defaultExistenceType = type;
-		this.firePropertyChanged(DEFAULT_EXISTENCE_TYPE_PROPERTY, old, type);
-	}
-
-
-	// ********** cacheable **********
-
-	public OrmCacheable2_0 getCacheable() {
-		return this.cacheable;
-	}
-
-	protected OrmCacheable2_0 buildCacheable() {
-		return this.isOrmXml2_0Compatible() ?
-				this.getContextNodeFactory2_0().buildOrmCacheable(this) :
-				new NullOrmCacheable2_0(this);
-	}
-
-	public boolean calculateDefaultCacheable() {
-		if ( ! this.getTypeMapping().isMetadataComplete()) {
-			JavaPersistentType javaPersistentType = this.getTypeMapping().getPersistentType().getJavaPersistentType();
-			if ((javaPersistentType != null) && (javaPersistentType.getMapping() instanceof CacheableHolder2_0)) {
-				return ((CacheableHolder2_0) javaPersistentType.getMapping()).getCacheable().isCacheable();
-			}
-		}
-		CacheableHolder2_0 superCacheableHolder = this.getCacheableSuperPersistentType(this.getTypeMapping().getPersistentType());
-		return (superCacheableHolder != null) ?
-				superCacheableHolder.getCacheable().isCacheable() :
-				((PersistenceUnit2_0) this.getPersistenceUnit()).calculateDefaultCacheable();
-	}
-
-	protected CacheableHolder2_0 getCacheableSuperPersistentType(PersistentType persistentType) {
-		PersistentType superPersistentType = persistentType.getSuperPersistentType();
-		if (superPersistentType == null) {
-			return null;
-		}
-		TypeMapping superMapping = superPersistentType.getMapping();
-		return (superMapping instanceof CacheableHolder2_0) ?
-				(CacheableHolder2_0) superMapping :
-				this.getCacheableSuperPersistentType(superPersistentType);  // recurse
-	}
-
-
-	// ********** XML cache **********
-
-	/**
-	 * Return null if the XML cache does not exists.
-	 */
-	protected XmlCache getXmlCache() {
-		return this.getXmlCacheHolder().getCache();
-	}
-
-	/**
-	 * Build the XML cache if it does not exist.
-	 */
-	protected XmlCache getXmlCacheForUpdate() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache != null) ? xmlCache : this.buildXmlCache();
-	}
-
-	protected XmlCache buildXmlCache() {
-		XmlCache xmlCache = EclipseLinkOrmFactory.eINSTANCE.createXmlCache();
-		this.getXmlCacheHolder().setCache(xmlCache);
-		return xmlCache;
-	}
-
-	protected void removeXmlCacheIfUnset() {
-		if (this.getXmlCache().isUnset()) {
-			this.removeXmlCache();
-		}
-	}
-
-	protected void removeXmlCache() {
-		this.getXmlCacheHolder().setCache(null);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public OrmEclipseLinkNonEmbeddableTypeMapping getParent() {
-		return (OrmEclipseLinkNonEmbeddableTypeMapping) super.getParent();
-	}
-
-	protected OrmEclipseLinkNonEmbeddableTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected XmlTypeMapping getXmlTypeMapping() {
-		return this.getTypeMapping().getXmlTypeMapping();
-	}
-
-	public XmlCacheable_2_0 getXmlCacheable() {
-		return (XmlCacheable_2_0) this.getXmlTypeMapping();
-	}
-
-	protected XmlCacheHolder getXmlCacheHolder() {
-		return (XmlCacheHolder) this.getXmlTypeMapping();
-	}
-
-	protected JavaEclipseLinkNonEmbeddableTypeMapping getJavaTypeMappingForDefaults() {
-		return this.getTypeMapping().getJavaTypeMappingForDefaults();
-	}
-
-	protected JavaEclipseLinkCaching getJavaCachingForDefaults() {
-		JavaEclipseLinkNonEmbeddableTypeMapping javaTypeMapping = this.getJavaTypeMappingForDefaults();
-		return (javaTypeMapping == null) ? null : javaTypeMapping.getCaching();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.getXmlValidationTextRange();
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange();
-	}
-
-	protected TextRange getXmlValidationTextRange() {
-		XmlCache xmlCache = this.getXmlCache();
-		return (xmlCache == null) ? null : xmlCache.getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkChangeTracking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkChangeTracking.java
deleted file mode 100644
index dd0657c4cf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkChangeTracking.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTrackingType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder;
-
-public class OrmEclipseLinkChangeTracking
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkChangeTracking
-{
-	protected EclipseLinkChangeTrackingType specifiedType;
-	protected EclipseLinkChangeTrackingType defaultType;
-
-
-	public OrmEclipseLinkChangeTracking(EclipseLinkOrmTypeMapping parent) {
-		super(parent);
-		this.specifiedType = this.buildSpecifiedType();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedType_(this.buildSpecifiedType());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDefaultType(this.buildDefaultType());
-	}
-
-
-	// ********** type **********
-
-	public EclipseLinkChangeTrackingType getType() {
-		return (this.specifiedType != null) ? this.specifiedType : this.defaultType;
-	}
-
-	public EclipseLinkChangeTrackingType getSpecifiedType() {
-		return this.specifiedType;
-	}
-
-	public void setSpecifiedType(EclipseLinkChangeTrackingType type) {
-		if (this.specifiedType != type) {
-			XmlChangeTracking xmlChangeTracking = this.getXmlChangeTrackingForUpdate();
-			this.setSpecifiedType_(type);
-			xmlChangeTracking.setType(EclipseLinkChangeTrackingType.toOrmResourceModel(type));
-			this.removeXmlChangeTrackingIfUnset();
-		}
-	}
-
-	protected void setSpecifiedType_(EclipseLinkChangeTrackingType type) {
-		EclipseLinkChangeTrackingType old = this.specifiedType;
-		this.specifiedType = type;
-		this.firePropertyChanged(SPECIFIED_TYPE_PROPERTY, old, type);
-	}
-
-	protected EclipseLinkChangeTrackingType buildSpecifiedType() {
-		XmlChangeTracking xmlChangeTracking = this.getXmlChangeTracking();
-		return (xmlChangeTracking == null) ? null : EclipseLinkChangeTrackingType.fromOrmResourceModel(xmlChangeTracking.getType());
-	}
-
-	public EclipseLinkChangeTrackingType getDefaultType() {
-		return this.defaultType;
-	}
-
-	protected void setDefaultType(EclipseLinkChangeTrackingType type) {
-		EclipseLinkChangeTrackingType old = this.defaultType;
-		this.defaultType = type;
-		this.firePropertyChanged(DEFAULT_TYPE_PROPERTY, old, type);
-	}
-
-	protected EclipseLinkChangeTrackingType buildDefaultType() {
-		EclipseLinkChangeTracking javaChangeTracking = this.getJavaChangeTrackingForDefaults();
-		return (javaChangeTracking != null) ? javaChangeTracking.getType() : DEFAULT_TYPE;
-	}
-
-
-	// ********** xml customizer class ref **********
-
-	/**
-	 * Return <code>null</code> if the XML change tracking does not exists.
-	 */
-	protected XmlChangeTracking getXmlChangeTracking() {
-		return this.getXmlChangeTrackingHolder().getChangeTracking();
-	}
-
-	/**
-	 * Build the XML change tracking if it does not exist.
-	 */
-	protected XmlChangeTracking getXmlChangeTrackingForUpdate() {
-		XmlChangeTracking xmlChangeTracking = this.getXmlChangeTracking();
-		return (xmlChangeTracking != null) ? xmlChangeTracking : this.buildXmlChangeTracking();
-	}
-
-	protected XmlChangeTracking buildXmlChangeTracking() {
-		XmlChangeTracking xmlChangeTracking = EclipseLinkOrmFactory.eINSTANCE.createXmlChangeTracking();
-		this.getXmlChangeTrackingHolder().setChangeTracking(xmlChangeTracking);
-		return xmlChangeTracking;
-	}
-
-	protected void removeXmlChangeTrackingIfUnset() {
-		if (this.getXmlChangeTracking().isUnset()) {
-			this.removeXmlChangeTracking();
-		}
-	}
-
-	protected void removeXmlChangeTracking() {
-		this.getXmlChangeTrackingHolder().setChangeTracking(null);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public EclipseLinkOrmTypeMapping getParent() {
-		return (EclipseLinkOrmTypeMapping) super.getParent();
-	}
-
-	protected EclipseLinkOrmTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected XmlTypeMapping getXmlTypeMapping() {
-		return this.getTypeMapping().getXmlTypeMapping();
-	}
-
-	protected XmlChangeTrackingHolder getXmlChangeTrackingHolder() {
-		return (XmlChangeTrackingHolder) this.getXmlTypeMapping();
-	}
-
-	protected EclipseLinkJavaTypeMapping getJavaTypeMappingForDefaults() {
-		return this.getTypeMapping().getJavaTypeMappingForDefaults();
-	}
-
-	protected EclipseLinkChangeTracking getJavaChangeTrackingForDefaults() {
-		EclipseLinkJavaTypeMapping javaTypeMapping = this.getJavaTypeMappingForDefaults();
-		return (javaTypeMapping == null) ? null : javaTypeMapping.getChangeTracking();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.getXmlValidationTextRange();
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange();
-	}
-
-	protected TextRange getXmlValidationTextRange() {
-		XmlChangeTracking xmlChangeTracking = this.getXmlChangeTracking();
-		return (xmlChangeTracking == null) ? null : xmlChangeTracking.getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConversionValue.java
deleted file mode 100644
index 578e09a43a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConversionValue.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConversionValue;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkConversionValue
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkConversionValue
-{
-	private final XmlConversionValue xmlConversionValue;
-
-	private String dataValue;
-
-	private String objectValue;
-
-
-	public OrmEclipseLinkConversionValue(OrmEclipseLinkObjectTypeConverter parent, XmlConversionValue xmlConversionValue) {
-		super(parent);
-		this.xmlConversionValue = xmlConversionValue;
-		this.dataValue = xmlConversionValue.getDataValue();
-		this.objectValue = xmlConversionValue.getObjectValue();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setDataValue_(this.xmlConversionValue.getDataValue());
-		this.setObjectValue_(this.xmlConversionValue.getObjectValue());
-	}
-
-
-	// ********** data value **********
-
-	public String getDataValue() {
-		return this.dataValue;
-	}
-
-	public void setDataValue(String value) {
-		this.setDataValue_(value);
-		this.xmlConversionValue.setDataValue(value);
-	}
-
-	protected void setDataValue_(String value) {
-		String old = this.dataValue;
-		this.dataValue = value;
-		this.firePropertyChanged(DATA_VALUE_PROPERTY, old, value);
-	}
-
-
-	// ********** object value **********
-
-	public String getObjectValue() {
-		return this.objectValue;
-	}
-
-	public void setObjectValue(String value) {
-		this.setObjectValue_(value);
-		this.xmlConversionValue.setObjectValue(value);
-	}
-
-	protected void setObjectValue_(String value) {
-		String old = this.objectValue;
-		this.objectValue = value;
-		this.firePropertyChanged(OBJECT_VALUE_PROPERTY, old, value);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public OrmEclipseLinkObjectTypeConverter getParent() {
-		return (OrmEclipseLinkObjectTypeConverter) super.getParent();
-	}
-
-	protected OrmEclipseLinkObjectTypeConverter getObjectTypeConverter() {
-		return this.getParent();
-	}
-
-	public XmlConversionValue getXmlConversionValue() {
-		return this.xmlConversionValue;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-	}
-
-	public TextRange getDataValueTextRange() {
-		return this.getValidationTextRange(this.xmlConversionValue.getDataValueTextRange());
-	}
-
-	protected TextRange getObjectValueTextRange() {
-		return this.getValidationTextRange(this.xmlConversionValue.getObjectValueTextRange());
-	}
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.xmlConversionValue.getValidationTextRange();
-		return (textRange != null) ? textRange : this.getObjectTypeConverter().getValidationTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java
deleted file mode 100644
index 4f3cb4bd1f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConvert.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.Association;
-import org.eclipse.jpt.common.utility.internal.SimpleAssociation;
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.jpa.core.context.Converter;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmConverter;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.ConverterTextRangeResolver;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmConverter;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkConvertValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-
-public class OrmEclipseLinkConvert
-	extends AbstractOrmConverter
-	implements EclipseLinkConvert
-{
-	protected String specifiedConverterName;
-	protected String defaultConverterName;
-
-	protected OrmEclipseLinkConverter<?> converter;
-
-
-	protected static final OrmEclipseLinkConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new OrmEclipseLinkConverter.Adapter[] {
-		OrmEclipseLinkCustomConverter.Adapter.instance(),
-		OrmEclipseLinkTypeConverter.Adapter.instance(),
-		OrmEclipseLinkObjectTypeConverter.Adapter.instance(),
-		OrmEclipseLinkStructConverter.Adapter.instance()
-	};
-	protected static final Iterable<OrmEclipseLinkConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<OrmEclipseLinkConverter.Adapter>(CONVERTER_ADAPTER_ARRAY);
-                                                                                                                      
-
-	public OrmEclipseLinkConvert(OrmAttributeMapping parent, OrmConverter.Owner owner) {
-		super(parent, owner);
-		this.specifiedConverterName = this.getXmlConvertibleMapping().getConvert();
-		this.converter = this.buildConverter();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit(){
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-	
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedConverterName_(this.getXmlConvertibleMapping().getConvert());
-		this.syncConverter();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDefaultConverterName(this.buildDefaultConverterName());
-		if (this.converter != null) {
-			this.converter.update();
-		}
-	}
-
-
-	// ********** converter name **********
-
-	public String getConverterName() {
-		return (this.specifiedConverterName != null) ? this.specifiedConverterName : this.defaultConverterName;
-	}
-
-	public String getSpecifiedConverterName() {
-		return this.specifiedConverterName;
-	}
-
-	public void setSpecifiedConverterName(String name) {
-		this.setSpecifiedConverterName_(name);
-		this.getXmlConvertibleMapping().setConvert(name);
-	}
-
-	protected void setSpecifiedConverterName_(String name) {
-		String old = this.specifiedConverterName;
-		this.specifiedConverterName = name;
-		this.firePropertyChanged(SPECIFIED_CONVERTER_NAME_PROPERTY, old, name);
-	}
-
-	public String getDefaultConverterName() {
-		return this.defaultConverterName;
-	}
-
-	protected void setDefaultConverterName(String name) {
-		String old = this.defaultConverterName;
-		this.defaultConverterName = name;
-		this.firePropertyChanged(DEFAULT_CONVERTER_NAME_PROPERTY, old, name);
-	}
-
-	protected String buildDefaultConverterName() {
-		return DEFAULT_CONVERTER_NAME;
-	}
-
-
-	// ********** converter **********
-
-	public OrmEclipseLinkConverter<?> getConverter() {
-		return this.converter;
-	}
-
-	public void setConverter(Class<? extends EclipseLinkConverter> converterType) {
-		if (converterType == null) {
-			if (this.converter != null) {
-				this.setConverter_(null);
-				this.removeXmlConverters();
-			}
-		} else {
-			if ((this.converter == null) || (this.converter.getType() != converterType)) {
-				// note: we may also remove the XML converter we want;
-				// but if we leave it, the resulting sync will screw things up...
-				this.removeXmlConverters();
-				OrmEclipseLinkConverter.Adapter converterAdapter = this.getConverterAdapter(converterType);
-				this.setConverter_(converterAdapter.buildConverter(this));
-				converterAdapter.addXmlConverter(this.getXmlConvertibleMapping(), this.converter.getXmlConverter());
-			}
-		}
-	}
-
-	protected void setConverter_(OrmEclipseLinkConverter<?> converter) {
-		OrmEclipseLinkConverter<?> old = this.converter;
-		this.converter = converter;
-		this.firePropertyChanged(CONVERTER_PROPERTY, old, converter);
-	}
-
-	protected void removeXmlConverters() {
-		XmlConvertibleMapping xmlMapping = this.getXmlConvertibleMapping();
-		for (OrmEclipseLinkConverter.Adapter adapter : this.getConverterAdapters()) {
-			adapter.removeXmlConverter(xmlMapping);
-		}
-	}
-
-	protected OrmEclipseLinkConverter<?> buildConverter() {
-		XmlConvertibleMapping xmlMapping = this.getXmlConvertibleMapping();
-		for (OrmEclipseLinkConverter.Adapter adapter : this.getConverterAdapters()) {
-			OrmEclipseLinkConverter<?> ormConverter = adapter.buildConverter(xmlMapping, this);
-			if (ormConverter != null) {
-				return ormConverter;
-			}
-		}
-		return null;
-	}
-
-	protected void syncConverter() {
-		Association<OrmEclipseLinkConverter.Adapter, XmlNamedConverter> assoc = this.getXmlConverter();
-		if (assoc == null) {
-			if (this.converter != null) {
-				this.setConverter_(null);
-			}
-		} else {
-			OrmEclipseLinkConverter.Adapter adapter = assoc.getKey();
-			XmlNamedConverter xmlConverter = assoc.getValue();
-			if ((this.converter != null) &&
-					(this.converter.getType() == adapter.getConverterType()) &&
-					(this.converter.getXmlConverter() == xmlConverter)) {
-				this.converter.synchronizeWithResourceModel();
-			} else {
-				this.setConverter_(adapter.buildConverter(xmlConverter, this));
-			}
-		}
-	}
-
-	/**
-	 * Return the first XML converter we find along with its corresponding
-	 * adapter. Return <code>null</code> if there are no converters in the XML.
-	 */
-	protected Association<OrmEclipseLinkConverter.Adapter, XmlNamedConverter> getXmlConverter() {
-		XmlConvertibleMapping xmlMapping = this.getXmlConvertibleMapping();
-		for (OrmEclipseLinkConverter.Adapter adapter : this.getConverterAdapters()) {
-			XmlNamedConverter xmlConverter = adapter.getXmlConverter(xmlMapping);
-			if (xmlConverter != null) {
-				return new SimpleAssociation<OrmEclipseLinkConverter.Adapter, XmlNamedConverter>(adapter, xmlConverter);
-			}
-		}
-		return null;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * Return the converter adapter for the specified converter type.
-	 */
-	protected OrmEclipseLinkConverter.Adapter getConverterAdapter(Class<? extends EclipseLinkConverter> converterType) {
-		for (OrmEclipseLinkConverter.Adapter adapter : this.getConverterAdapters()) {
-			if (adapter.getConverterType() == converterType) {
-				return adapter;
-			}
-		}
-		throw new IllegalArgumentException("unknown converter type: " + converterType.getName()); //$NON-NLS-1$
-	}
-
-	protected Iterable<OrmEclipseLinkConverter.Adapter> getConverterAdapters() {
-		return CONVERTER_ADAPTERS;
-	}
-
-
-	// ********** misc **********
-
-	protected XmlConvertibleMapping getXmlConvertibleMapping() {
-		// cast to EclipseLink type
-		return (XmlConvertibleMapping) super.getXmlAttributeMapping();
-	}
-
-	public Class<? extends Converter> getType() {
-		return EclipseLinkConvert.class;
-	}
-
-	public void initialize() {
-		this.specifiedConverterName = ""; //$NON-NLS-1$
-		this.getXmlConvertibleMapping().setConvert(this.specifiedConverterName);
-	}
-
-
-	// ********** refactoring **********
-
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return (this.converter != null) ?
-				this.converter.createRenameTypeEdits(originalType, newName) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return (this.converter != null) ?
-				this.converter.createRenamePackageEdits(originalPackage, newName) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return (this.converter != null) ?
-				this.converter.createMoveTypeEdits(originalType, newPackage) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-
-	// ********** validation **********
-	
-	@Override
-	protected TextRange getXmlValidationTextRange() {
-		return this.getXmlConvertibleMapping().getConvertTextRange();
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		implements OrmConverter.Adapter, OrmConverter.Owner
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<? extends Converter> getConverterType() {
-			return EclipseLinkConvert.class;
-		}
-
-		public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) {
-			XmlConvertibleMapping xmlMapping = (XmlConvertibleMapping) parent.getXmlAttributeMapping();
-			return (xmlMapping.getConvert() == null) ? null : new OrmEclipseLinkConvert(parent, this);
-		}
-
-		public boolean isActive(XmlAttributeMapping xmlMapping) {
-			return ((XmlConvertibleMapping) xmlMapping).getConvert() != null;
-		}
-
-		public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) {
-			return new OrmEclipseLinkConvert(parent, this);
-		}
-
-		public void clearXmlValue(XmlAttributeMapping xmlMapping) {
-			((XmlConvertibleMapping) xmlMapping).setConvert(null);
-		}
-
-		public JptValidator buildValidator(Converter converter, ConverterTextRangeResolver textRangeResolver) {
-			return new EclipseLinkConvertValidator((EclipseLinkConvert) converter, textRangeResolver);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverter.java
deleted file mode 100644
index 55d1271f21..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverter.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public abstract class OrmEclipseLinkConverter<X extends XmlNamedConverter>
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkConverter
-{
-	protected final X xmlConverter;
-
-	protected String name;
-
-
-	protected OrmEclipseLinkConverter(XmlContextNode parent, X xmlConverter) {
-		super(parent);
-		this.xmlConverter = xmlConverter;
-		this.name = xmlConverter.getName();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setName_(this.xmlConverter.getName());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-	}
-
-
-	// ********** name **********
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String name) {
-		this.setName_(name);
-		this.xmlConverter.setName(name);
-	}
-
-	protected void setName_(String name) {
-		String old = this.name;
-		this.name = name;
-		this.firePropertyChanged(NAME_PROPERTY, old, name);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public XmlContextNode getParent() {
-		return (XmlContextNode) super.getParent();
-	}
-
-	public X getXmlConverter() {
-		return this.xmlConverter;
-	}
-
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-
-	public char getEnclosingTypeSeparator() {
-		return '$';
-	}
-
-
-	// ********** refactoring **********
-
-	public abstract Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName);
-
-	public abstract Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage);
-
-	public abstract Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName);
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.validateName(messages);
-	}
-
-	protected void validateName(List<IMessage> messages) {
-		if (StringTools.stringIsEmpty(this.name)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY, 
-					EclipseLinkJpaValidationMessages.CONVERTER_NAME_UNDEFINED, 
-					EMPTY_STRING_ARRAY,
-					this,
-					this.getNameTextRange()
-				)
-			);
-			return;
-		}
-
-		if (ArrayTools.contains(EclipseLinkConvert.RESERVED_CONVERTER_NAMES, this.name)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.RESERVED_CONVERTER_NAME,
-					EMPTY_STRING_ARRAY,
-					this,
-					this.getNameTextRange()
-				)
-			);
-		}
-	}
-	
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.xmlConverter.getValidationTextRange();
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange();
-	}
-
-	public TextRange getNameTextRange() {
-		return this.getValidationTextRange(this.xmlConverter.getNameTextRange());
-	}
-
-
-	// ********** adapter **********
-
-	/**
-	 * This interface allows a client to interact with various
-	 * EclipseLink <code>orm.xml</code> converters via the same protocol.
-	 */
-	public interface Adapter
-	{
-		/**
-		 * Return the type of converter handled by the adapter.
-		 */
-		Class<? extends EclipseLinkConverter> getConverterType();
-
-		/**
-		 * Build a converter corresponding to the specified XML converter
-		 * container if the container holds the adapter's XML converter. Return
-		 * <code>null</code> otherwise.
-		 * This is used to build a converter during construction of the
-		 * converter's parent.
-		 */
-		OrmEclipseLinkConverter<? extends XmlNamedConverter> buildConverter(XmlConverterHolder xmlConverterContainer, XmlContextNode parent);
-
-		/**
-		 * Return the adapter's XML converter for the specified XML converter
-		 * container. Return <code>null</code> if the container does not hold
-		 * the adapter's XML converter.
-		 * The returned XML converter is compared to the parent's
-		 * converter's XML converter while the context model is synchronized
-		 * with the resource model. If it has changed, the parent will build
-		 * a new converter (via the adapter).
-		 * 
-		 * @see #buildConverter(XmlNamedConverter, XmlContextNode)
-		 */
-		XmlNamedConverter getXmlConverter(XmlConverterHolder xmlConverterContainer);
-
-		/**
-		 * Build a converter using the specified XML converter.
-		 * This is used when the context model is synchronized with the
-		 * resource model (and the resource model has changed).
-		 * 
-		 * @see #getXmlConverter(XmlConverterHolder)
-		 */
-		OrmEclipseLinkConverter<? extends XmlNamedConverter> buildConverter(XmlNamedConverter xmlConverter, XmlContextNode parent);
-
-		/**
-		 * Build a new converter and its corresponding XML converter.
-		 * The XML converter will be added to the XML converter container once
-		 * the context converter has been added to the context model.
-		 * 
-		 * @see #addXmlConverter(XmlConverterHolder, XmlNamedConverter)
-		 */
-		OrmEclipseLinkConverter<? extends XmlNamedConverter> buildConverter(XmlContextNode parent);
-
-		/**
-		 * Remove the adapter's XML converter from the specified XML converter
-		 * container.
-		 */
-		void removeXmlConverter(XmlConverterHolder xmlConverterContainer);
-
-		/**
-		 * Add the specified XML converter to the specified XML converter
-		 * container.
-		 */
-		void addXmlConverter(XmlConverterHolder xmlConverterContainer, XmlNamedConverter xmlConverter);
-	}
-
-
-	// ********** abstract adapter **********
-
-	public abstract static class AbstractAdapter
-		implements Adapter
-	{
-		public OrmEclipseLinkConverter<? extends XmlNamedConverter> buildConverter(XmlConverterHolder xmlConverterContainer, XmlContextNode parent) {
-			XmlNamedConverter xmlConverter = this.getXmlConverter(xmlConverterContainer);
-			return (xmlConverter == null) ? null : this.buildConverter(xmlConverter, parent);
-		}
-
-		public OrmEclipseLinkConverter<? extends XmlNamedConverter> buildConverter(XmlContextNode parent) {
-			return this.buildConverter(this.buildXmlConverter(), parent);
-		}
-
-		protected abstract XmlNamedConverter buildXmlConverter();
-
-		public void removeXmlConverter(XmlConverterHolder xmlConverterContainer) {
-			this.setXmlConverter(xmlConverterContainer, null);
-		}
-
-		public void addXmlConverter(XmlConverterHolder xmlConverterContainer, XmlNamedConverter xmlConverter) {
-			this.setXmlConverter(xmlConverterContainer, xmlConverter);
-		}
-
-		protected abstract void setXmlConverter(XmlConverterHolder xmlConverterContainer, XmlNamedConverter xmlConverter);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverterClassConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverterClassConverter.java
deleted file mode 100644
index 9868e13404..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverterClassConverter.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.internal.utility.JDTTools;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterClassConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public abstract class OrmEclipseLinkConverterClassConverter<X extends XmlNamedConverter>
-	extends OrmEclipseLinkConverter<X>
-	implements EclipseLinkConverterClassConverter
-{
-	private String converterClass;
-
-	protected JavaResourceAbstractType converterResourceType;
-
-
-	public OrmEclipseLinkConverterClassConverter(XmlContextNode parent, X xmlConverter, String converterClass) {
-		super(parent, xmlConverter);
-		this.converterClass = converterClass;
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setConverterClass_(this.getXmlConverterClass());
-	}
-
-
-	// ********** converter class **********
-
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-
-	public void setConverterClass(String converterClass) {
-		this.setConverterClass_(converterClass);
-		this.setXmlConverterClass(converterClass);
-	}
-
-	protected void setConverterClass_(String newConverterClass) {
-		String oldConverterClass = this.converterClass;
-		this.converterClass = newConverterClass;
-		this.firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
-	}
-
-	protected JavaResourceAbstractType getConverterJavaResourceType() {
-		return this.getMappingFileRoot().resolveJavaResourceType(this.converterClass);
-	}
-
-	protected abstract String getXmlConverterClass();
-
-	protected abstract void setXmlConverterClass(String converterClass);
-
-
-	// ********** resource interaction **********
-
-	protected void updateConverterResourceType() {
-		this.converterResourceType = this.getConverterJavaResourceType();
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.validateConverterClass(messages);
-	}
-
-	protected void validateConverterClass(List<IMessage> messages) {
-		if (StringTools.stringIsEmpty(this.converterClass)) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.CONVERTER_CLASS_DEFINED,
-					this,
-					this.getConverterClassTextRange()
-				)
-			);
-			return;
-		}
-
-		if ( ! this.converterClassExists()) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					EclipseLinkJpaValidationMessages.CONVERTER_CLASS_EXISTS,
-					new String[] {this.converterClass},
-					this,
-					this.getConverterClassTextRange()
-				)
-			);
-			return;
-		}
-
-		if ( ! this.converterClassImplementsInterface(this.getEclipseLinkConverterInterface())) {
-			messages.add(
-				DefaultEclipseLinkJpaValidationMessages.buildMessage(
-					IMessage.HIGH_SEVERITY,
-					this.getEclipseLinkConverterInterfaceErrorMessage(),
-					new String[] {this.converterClass},
-					this,
-					this.getConverterClassTextRange()
-				)
-			);
-		}
-	}
-
-	/**
-	 * Return the name of the EclipseLink interface the converter class must
-	 * implement.
-	 */
-	protected abstract String getEclipseLinkConverterInterface();
-
-	protected abstract String getEclipseLinkConverterInterfaceErrorMessage();
-
-	protected boolean converterClassExists() {
-		return this.typeExists(this.converterClass) ||
-				this.typeExists(this.getAlternateConverterClass());
-	}
-
-	/**
-	 * Add <code>null</code> check.
-	 */
-	protected boolean typeExists(String typeName) {
-		return (typeName != null) && 
-				(JDTTools.findType(this.getJavaProject(), typeName) != null);
-	}
-
-	/**
-	 * Add <code>null</code> check.
-	 */
-	protected boolean typeImplementsInterface(String typeName, String interfaceName) {
-		return (typeName != null) && 
-				JDTTools.typeIsSubType(this.getJavaProject(), typeName, interfaceName);
-	}
-
-	protected boolean converterClassImplementsInterface(String interfaceName) {
-		return this.typeImplementsInterface(this.converterClass, interfaceName) ||
-				this.typeImplementsInterface(this.getAlternateConverterClass(), interfaceName);
-	}
-
-	/**
-	 * If present, append the mapping file package to the converter class and
-	 * return it. Return <code>null</code> if the mapping file package is not
-	 * specified.
-	 */
-	protected String getAlternateConverterClass() {
-		String mappingFilePackage = this.getMappingFileRoot().getPackage();
-		if (StringTools.stringIsEmpty(mappingFilePackage)) {
-			return null;
-		}
-		return mappingFilePackage + '.' + this.converterClass;
-	}
-
-	protected TextRange getConverterClassTextRange() {
-		return this.getValidationTextRange(this.getXmlConverterClassTextRange());
-	}
-
-	protected abstract TextRange getXmlConverterClassTextRange();
-
-	protected IJavaProject getJavaProject() {
-		return this.getJpaProject().getJavaProject();
-	}
-
-
-	// ********** refactoring **********
-
-	@Override
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return this.isFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameEdit(originalType, newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected abstract ReplaceEdit createRenameEdit(IType originalType, String newName);
-
-	@Override
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.isFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenamePackageEdit(newPackage.getElementName())) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected abstract ReplaceEdit createRenamePackageEdit(String newName);
-
-	@Override
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.isIn(originalPackage) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenamePackageEdit(newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected boolean isFor(String typeName) {
-		JavaResourceAbstractType converterType = this.getConverterJavaResourceType();
-		return (converterType != null) && converterType.getQualifiedName().equals(typeName);
-	}
-
-	protected boolean isIn(IPackageFragment packageFragment) {
-		JavaResourceAbstractType converterType = this.getConverterJavaResourceType();
-		return (converterType != null) && converterType.isIn(packageFragment);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverterContainerImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverterContainerImpl.java
deleted file mode 100644
index f41d694174..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkConverterContainerImpl.java
+++ /dev/null
@@ -1,602 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkObjectTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkConverterContainerImpl
-	extends AbstractOrmXmlContextNode
-	implements OrmEclipseLinkConverterContainer
-{
-	private final XmlConvertersHolder xmlConvertersHolder;
-
-	protected final ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter> customConverterContainer;
-	protected final ContextListContainer<OrmEclipseLinkObjectTypeConverter, XmlObjectTypeConverter> objectTypeConverterContainer;
-	protected final ContextListContainer<OrmEclipseLinkStructConverter, XmlStructConverter> structConverterContainer;
-	protected final ContextListContainer<OrmEclipseLinkTypeConverter, XmlTypeConverter> typeConverterContainer;
-
-
-	public OrmEclipseLinkConverterContainerImpl(XmlContextNode parent, XmlConvertersHolder xmlConvertersHolder) {
-		super(parent);
-		this.xmlConvertersHolder = xmlConvertersHolder;
-
-		this.customConverterContainer = this.buildCustomConverterContainer();
-		this.objectTypeConverterContainer = this.buildObjectTypeConverterContainer();
-		this.structConverterContainer = this.buildStructConverterContainer();
-		this.typeConverterContainer = this.buildTypeConverterContainer();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.syncCustomConverters();
-		this.syncObjectTypeConverters();
-		this.syncStructConverters();
-		this.syncTypeConverters();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.updateNodes(this.getCustomConverters());
-		this.updateNodes(this.getObjectTypeConverters());
-		this.updateNodes(this.getStructConverters());
-		this.updateNodes(this.getTypeConverters());
-	}
-
-
-	// ********** custom converters **********
-
-	public ListIterable<OrmEclipseLinkCustomConverter> getCustomConverters() {
-		return this.customConverterContainer.getContextElements();
-	}
-
-	public int getCustomConvertersSize() {
-		return this.customConverterContainer.getContextElementsSize();
-	}
-
-	public OrmEclipseLinkCustomConverter addCustomConverter() {
-		return this.addCustomConverter(this.getCustomConvertersSize());
-	}
-
-	public OrmEclipseLinkCustomConverter addCustomConverter(int index) {
-		XmlConverter xmlConverter = this.buildXmlCustomConverter();
-		OrmEclipseLinkCustomConverter converter = this.customConverterContainer.addContextElement(index, xmlConverter);
-		this.xmlConvertersHolder.getConverters().add(index, xmlConverter);
-		return converter;
-	}
-
-	protected XmlConverter buildXmlCustomConverter() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlConverter();
-	}
-
-	public void removeCustomConverter(EclipseLinkCustomConverter converter) {
-		this.removeCustomConverter(this.customConverterContainer.indexOfContextElement((OrmEclipseLinkCustomConverter) converter));
-	}
-
-	public void removeCustomConverter(int index) {
-		this.customConverterContainer.removeContextElement(index);
-		this.xmlConvertersHolder.getConverters().remove(index);
-	}
-
-	public void moveCustomConverter(int targetIndex, int sourceIndex) {
-		this.customConverterContainer.moveContextElement(targetIndex, sourceIndex);
-		this.xmlConvertersHolder.getConverters().move(targetIndex, sourceIndex);
-	}
-
-	protected OrmEclipseLinkCustomConverter buildCustomConverter(XmlConverter xmlConverter) {
-		return new OrmEclipseLinkCustomConverter(this, xmlConverter);
-	}
-
-	protected void syncCustomConverters() {
-		this.customConverterContainer.synchronizeWithResourceModel();
-	}
-
-	protected ListIterable<XmlConverter> getXmlCustomConverters() {
-		// clone to reduce chance of concurrency problems
-		return new LiveCloneListIterable<XmlConverter>(this.xmlConvertersHolder.getConverters());
-	}
-
-	protected ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter> buildCustomConverterContainer() {
-		return new CustomConverterContainer();
-	}
-
-	/**
-	 * custom converter container
-	 */
-	protected class CustomConverterContainer
-		extends ContextListContainer<OrmEclipseLinkCustomConverter, XmlConverter>
-	{
-		@Override
-		protected String getContextElementsPropertyName() {
-			return CUSTOM_CONVERTERS_LIST;
-		}
-		@Override
-		protected OrmEclipseLinkCustomConverter buildContextElement(XmlConverter resourceElement) {
-			return OrmEclipseLinkConverterContainerImpl.this.buildCustomConverter(resourceElement);
-		}
-		@Override
-		protected ListIterable<XmlConverter> getResourceElements() {
-			return OrmEclipseLinkConverterContainerImpl.this.getXmlCustomConverters();
-		}
-		@Override
-		protected XmlConverter getResourceElement(OrmEclipseLinkCustomConverter contextElement) {
-			return contextElement.getXmlConverter();
-		}
-	}
-
-
-	// ********** object type converters **********
-
-	public ListIterable<OrmEclipseLinkObjectTypeConverter> getObjectTypeConverters() {
-		return this.objectTypeConverterContainer.getContextElements();
-	}
-
-	public int getObjectTypeConvertersSize() {
-		return this.objectTypeConverterContainer.getContextElementsSize();
-	}
-
-	public OrmEclipseLinkObjectTypeConverter addObjectTypeConverter() {
-		return this.addObjectTypeConverter(this.getObjectTypeConvertersSize());
-	}
-
-	public OrmEclipseLinkObjectTypeConverter addObjectTypeConverter(int index) {
-		XmlObjectTypeConverter xmlConverter = this.buildXmlObjectTypeConverter();
-		OrmEclipseLinkObjectTypeConverter converter = this.objectTypeConverterContainer.addContextElement(index, xmlConverter);
-		this.xmlConvertersHolder.getObjectTypeConverters().add(index, xmlConverter);
-		return converter;
-	}
-
-	protected XmlObjectTypeConverter buildXmlObjectTypeConverter() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter();
-	}
-
-	public void removeObjectTypeConverter(EclipseLinkObjectTypeConverter converter) {
-		this.removeObjectTypeConverter(this.objectTypeConverterContainer.indexOfContextElement((OrmEclipseLinkObjectTypeConverter) converter));
-	}
-
-	public void removeObjectTypeConverter(int index) {
-		this.objectTypeConverterContainer.removeContextElement(index);
-		this.xmlConvertersHolder.getObjectTypeConverters().remove(index);
-	}
-
-	public void moveObjectTypeConverter(int targetIndex, int sourceIndex) {
-		this.objectTypeConverterContainer.moveContextElement(targetIndex, sourceIndex);
-		this.xmlConvertersHolder.getObjectTypeConverters().move(targetIndex, sourceIndex);
-	}
-
-	protected OrmEclipseLinkObjectTypeConverter buildObjectTypeConverter(XmlObjectTypeConverter xmlConverter) {
-		return new OrmEclipseLinkObjectTypeConverter(this, xmlConverter);
-	}
-
-	protected void syncObjectTypeConverters() {
-		this.objectTypeConverterContainer.synchronizeWithResourceModel();
-	}
-
-	protected ListIterable<XmlObjectTypeConverter> getXmlObjectTypeConverters() {
-		// clone to reduce chance of concurrency problems
-		return new LiveCloneListIterable<XmlObjectTypeConverter>(this.xmlConvertersHolder.getObjectTypeConverters());
-	}
-
-	protected ContextListContainer<OrmEclipseLinkObjectTypeConverter, XmlObjectTypeConverter> buildObjectTypeConverterContainer() {
-		return new ObjectTypeConverterContainer();
-	}
-
-	/**
-	 * object type converter container
-	 */
-	protected class ObjectTypeConverterContainer
-		extends ContextListContainer<OrmEclipseLinkObjectTypeConverter, XmlObjectTypeConverter>
-	{
-		@Override
-		protected String getContextElementsPropertyName() {
-			return OBJECT_TYPE_CONVERTERS_LIST;
-		}
-		@Override
-		protected OrmEclipseLinkObjectTypeConverter buildContextElement(XmlObjectTypeConverter resourceElement) {
-			return OrmEclipseLinkConverterContainerImpl.this.buildObjectTypeConverter(resourceElement);
-		}
-		@Override
-		protected ListIterable<XmlObjectTypeConverter> getResourceElements() {
-			return OrmEclipseLinkConverterContainerImpl.this.getXmlObjectTypeConverters();
-		}
-		@Override
-		protected XmlObjectTypeConverter getResourceElement(OrmEclipseLinkObjectTypeConverter contextElement) {
-			return contextElement.getXmlConverter();
-		}
-	}
-
-	// ********** struct converters **********
-
-	public ListIterable<OrmEclipseLinkStructConverter> getStructConverters() {
-		return this.structConverterContainer.getContextElements();
-	}
-
-	public int getStructConvertersSize() {
-		return this.structConverterContainer.getContextElementsSize();
-	}
-
-	public OrmEclipseLinkStructConverter addStructConverter() {
-		return this.addStructConverter(this.getStructConvertersSize());
-	}
-
-	public OrmEclipseLinkStructConverter addStructConverter(int index) {
-		XmlStructConverter xmlConverter = this.buildXmlStructConverter();
-		OrmEclipseLinkStructConverter converter = this.structConverterContainer.addContextElement(index, xmlConverter);
-		this.xmlConvertersHolder.getStructConverters().add(index, xmlConverter);
-		return converter;
-	}
-
-	protected XmlStructConverter buildXmlStructConverter() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter();
-	}
-
-	public void removeStructConverter(EclipseLinkStructConverter converter) {
-		this.removeStructConverter(this.structConverterContainer.indexOfContextElement((OrmEclipseLinkStructConverter) converter));
-	}
-
-	public void removeStructConverter(int index) {
-		this.structConverterContainer.removeContextElement(index);
-		this.xmlConvertersHolder.getStructConverters().remove(index);
-	}
-
-	public void moveStructConverter(int targetIndex, int sourceIndex) {
-		this.structConverterContainer.moveContextElement(targetIndex, sourceIndex);
-		this.xmlConvertersHolder.getStructConverters().move(targetIndex, sourceIndex);
-	}
-
-	protected OrmEclipseLinkStructConverter buildStructConverter(XmlStructConverter xmlConverter) {
-		return new OrmEclipseLinkStructConverter(this, xmlConverter);
-	}
-
-	protected void syncStructConverters() {
-		this.structConverterContainer.synchronizeWithResourceModel();
-	}
-
-	protected ListIterable<XmlStructConverter> getXmlStructConverters() {
-		// clone to reduce chance of concurrency problems
-		return new LiveCloneListIterable<XmlStructConverter>(this.xmlConvertersHolder.getStructConverters());
-	}
-
-	protected ContextListContainer<OrmEclipseLinkStructConverter, XmlStructConverter> buildStructConverterContainer() {
-		return new StructConverterContainer();
-	}
-
-	/**
-	 * struct converter container
-	 */
-	protected class StructConverterContainer
-		extends ContextListContainer<OrmEclipseLinkStructConverter, XmlStructConverter>
-	{
-		@Override
-		protected String getContextElementsPropertyName() {
-			return STRUCT_CONVERTERS_LIST;
-		}
-		@Override
-		protected OrmEclipseLinkStructConverter buildContextElement(XmlStructConverter resourceElement) {
-			return OrmEclipseLinkConverterContainerImpl.this.buildStructConverter(resourceElement);
-		}
-		@Override
-		protected ListIterable<XmlStructConverter> getResourceElements() {
-			return OrmEclipseLinkConverterContainerImpl.this.getXmlStructConverters();
-		}
-		@Override
-		protected XmlStructConverter getResourceElement(OrmEclipseLinkStructConverter contextElement) {
-			return contextElement.getXmlConverter();
-		}
-	}
-
-
-	// ********** type converters **********
-
-	public ListIterable<OrmEclipseLinkTypeConverter> getTypeConverters() {
-		return this.typeConverterContainer.getContextElements();
-	}
-
-	public int getTypeConvertersSize() {
-		return this.typeConverterContainer.getContextElementsSize();
-	}
-
-	public OrmEclipseLinkTypeConverter addTypeConverter() {
-		return this.addTypeConverter(this.getTypeConvertersSize());
-	}
-
-	public OrmEclipseLinkTypeConverter addTypeConverter(int index) {
-		XmlTypeConverter xmlConverter = this.buildXmlTypeConverter();
-		OrmEclipseLinkTypeConverter converter = this.typeConverterContainer.addContextElement(index, xmlConverter);
-		this.xmlConvertersHolder.getTypeConverters().add(index, xmlConverter);
-		return converter;
-	}
-
-	protected XmlTypeConverter buildXmlTypeConverter() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter();
-	}
-
-	public void removeTypeConverter(EclipseLinkTypeConverter converter) {
-		this.removeTypeConverter(this.typeConverterContainer.indexOfContextElement((OrmEclipseLinkTypeConverter) converter));
-	}
-
-	public void removeTypeConverter(int index) {
-		this.typeConverterContainer.removeContextElement(index);
-		this.xmlConvertersHolder.getTypeConverters().remove(index);
-	}
-
-	public void moveTypeConverter(int targetIndex, int sourceIndex) {
-		this.typeConverterContainer.moveContextElement(targetIndex, sourceIndex);
-		this.xmlConvertersHolder.getTypeConverters().move(targetIndex, sourceIndex);
-	}
-
-	protected OrmEclipseLinkTypeConverter buildTypeConverter(XmlTypeConverter xmlConverter) {
-		return new OrmEclipseLinkTypeConverter(this, xmlConverter);
-	}
-
-	protected void syncTypeConverters() {
-		this.typeConverterContainer.synchronizeWithResourceModel();
-	}
-
-	protected ListIterable<XmlTypeConverter> getXmlTypeConverters() {
-		// clone to reduce chance of concurrency problems
-		return new LiveCloneListIterable<XmlTypeConverter>(this.xmlConvertersHolder.getTypeConverters());
-	}
-
-	protected ContextListContainer<OrmEclipseLinkTypeConverter, XmlTypeConverter> buildTypeConverterContainer() {
-		return new TypeConverterContainer();
-	}
-
-	/**
-	 * type converter container
-	 */
-	protected class TypeConverterContainer
-		extends ContextListContainer<OrmEclipseLinkTypeConverter, XmlTypeConverter>
-	{
-		@Override
-		protected String getContextElementsPropertyName() {
-			return TYPE_CONVERTERS_LIST;
-		}
-		@Override
-		protected OrmEclipseLinkTypeConverter buildContextElement(XmlTypeConverter resourceElement) {
-			return OrmEclipseLinkConverterContainerImpl.this.buildTypeConverter(resourceElement);
-		}
-		@Override
-		protected ListIterable<XmlTypeConverter> getResourceElements() {
-			return OrmEclipseLinkConverterContainerImpl.this.getXmlTypeConverters();
-		}
-		@Override
-		protected XmlTypeConverter getResourceElement(OrmEclipseLinkTypeConverter contextElement) {
-			return contextElement.getXmlConverter();
-		}
-	}
-
-
-	// ********** refactoring **********
-
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			this.createRenameObjectTypeConverterEdits(originalType, newName),
-			this.createRenameTypeConverterEdits(originalType, newName),
-			this.createRenameStructConverterEdits(originalType, newName),
-			this.createRenameCustomConverterEdits(originalType, newName));
-	}
-
-	protected Iterable<ReplaceEdit> createRenameObjectTypeConverterEdits(final IType originalType, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkObjectTypeConverter, Iterable<ReplaceEdit>>(getObjectTypeConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkObjectTypeConverter objectTypeConverter) {
-					return objectTypeConverter.createRenameTypeEdits(originalType, newName);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameTypeConverterEdits(final IType originalType, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkTypeConverter, Iterable<ReplaceEdit>>(getTypeConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkTypeConverter typeConverter) {
-					return typeConverter.createRenameTypeEdits(originalType, newName);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameStructConverterEdits(final IType originalType, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkStructConverter, Iterable<ReplaceEdit>>(getStructConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkStructConverter structConverter) {
-					return structConverter.createRenameTypeEdits(originalType, newName);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameCustomConverterEdits(final IType originalType, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkCustomConverter, Iterable<ReplaceEdit>>(getCustomConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkCustomConverter customConverter) {
-					return customConverter.createRenameTypeEdits(originalType, newName);
-				}
-			}
-		);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-			this.createMoveObjectTypeConverterEdits(originalType, newPackage),
-			this.createMoveTypeConverterEdits(originalType, newPackage),
-			this.createMoveStructConverterEdits(originalType, newPackage),
-			this.createMoveCustomConverterEdits(originalType, newPackage));
-	}
-
-	protected Iterable<ReplaceEdit> createMoveObjectTypeConverterEdits(final IType originalType, final IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkObjectTypeConverter, Iterable<ReplaceEdit>>(getObjectTypeConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkObjectTypeConverter objectTypeConverter) {
-					return objectTypeConverter.createMoveTypeEdits(originalType, newPackage);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createMoveTypeConverterEdits(final IType originalType, final IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkTypeConverter, Iterable<ReplaceEdit>>(getTypeConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkTypeConverter typeConverter) {
-					return typeConverter.createMoveTypeEdits(originalType, newPackage);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createMoveStructConverterEdits(final IType originalType, final IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkStructConverter, Iterable<ReplaceEdit>>(getStructConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkStructConverter structConverter) {
-					return structConverter.createMoveTypeEdits(originalType, newPackage);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createMoveCustomConverterEdits(final IType originalType, final IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkCustomConverter, Iterable<ReplaceEdit>>(getCustomConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkCustomConverter customConverter) {
-					return customConverter.createMoveTypeEdits(originalType, newPackage);
-				}
-			}
-		);
-	}
-
-
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			this.createObjectTypeConverterRenamePackageEdits(originalPackage, newName),
-			this.createTypeConverterRenamePackageEdits(originalPackage, newName),
-			this.createStructConverterRenamePackageEdits(originalPackage, newName),
-			this.createCustomConverterRenamePackageEdits(originalPackage, newName));
-	}
-
-	protected Iterable<ReplaceEdit> createObjectTypeConverterRenamePackageEdits(final IPackageFragment originalPackage, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkObjectTypeConverter, Iterable<ReplaceEdit>>(getObjectTypeConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkObjectTypeConverter objectTypeConverter) {
-					return objectTypeConverter.createRenamePackageEdits(originalPackage, newName);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createTypeConverterRenamePackageEdits(final IPackageFragment originalPackage, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkTypeConverter, Iterable<ReplaceEdit>>(getTypeConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkTypeConverter typeConverter) {
-					return typeConverter.createRenamePackageEdits(originalPackage, newName);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createStructConverterRenamePackageEdits(final IPackageFragment originalPackage, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkStructConverter, Iterable<ReplaceEdit>>(getStructConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkStructConverter structConverter) {
-					return structConverter.createRenamePackageEdits(originalPackage, newName);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomConverterRenamePackageEdits(final IPackageFragment originalPackage, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<OrmEclipseLinkCustomConverter, Iterable<ReplaceEdit>>(getCustomConverters()) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(OrmEclipseLinkCustomConverter customConverter) {
-					return customConverter.createRenamePackageEdits(originalPackage, newName);
-				}
-			}
-		);
-	}
-
-
-	// ********** validation **********
-
-	/**
-	 * The converters are validated in the persistence unit.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit#validateConverters(List, IReporter)
-	 */
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// converters are validated in the persistence unit
-	}
-	
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.xmlConvertersHolder.getValidationTextRange();
-		return (textRange != null) ? textRange : this.getParent().getValidationTextRange();
-	}
-
-
-	// ********** misc **********
-
-	@SuppressWarnings("unchecked")
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(
-					this.getCustomConverters(),
-					this.getObjectTypeConverters(),
-					this.getStructConverters(),
-					this.getTypeConverters()
-				);
-	}
-
-	@Override
-	public XmlContextNode getParent() {
-		return (XmlContextNode) super.getParent();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCustomConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCustomConverter.java
deleted file mode 100644
index d5fe0b86ba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCustomConverter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-
-public class OrmEclipseLinkCustomConverter
-	extends OrmEclipseLinkConverterClassConverter<XmlConverter>
-	implements EclipseLinkCustomConverter
-{
-	public OrmEclipseLinkCustomConverter(XmlContextNode parent, XmlConverter xmlConverter) {
-		super(parent, xmlConverter, xmlConverter.getClassName());
-	}
-
-
-	// ********** converter class **********
-
-	@Override
-	protected String getXmlConverterClass() {
-		return this.xmlConverter.getClassName();
-	}
-
-	@Override
-	protected void setXmlConverterClass(String converterClass) {
-		this.xmlConverter.setClassName(converterClass);
-	}
-
-
-	// ********** misc **********
-
-	public Class<EclipseLinkCustomConverter> getType() {
-		return EclipseLinkCustomConverter.class;
-	}
-
-
-	// ********** refactoring **********
-
-	@Override
-	protected ReplaceEdit createRenameEdit(IType originalType, String newName) {
-		return this.xmlConverter.createRenameEdit(originalType, newName);
-	}
-
-	@Override
-	protected ReplaceEdit createRenamePackageEdit(String newName) {
-		return xmlConverter.createRenamePackageEdit(newName);
-	}
-
-
-	// ********** validation **********
-	
-	@Override
-	protected String getEclipseLinkConverterInterface() {
-		return ECLIPSELINK_CONVERTER_CLASS_NAME;
-	}
-
-	@Override
-	protected String getEclipseLinkConverterInterfaceErrorMessage() {
-		return EclipseLinkJpaValidationMessages.CONVERTER_CLASS_IMPLEMENTS_CONVERTER;
-	}
-
-	@Override
-	protected TextRange getXmlConverterClassTextRange() {
-		return this.xmlConverter.getConverterClassTextRange();
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<EclipseLinkCustomConverter> getConverterType() {
-			return EclipseLinkCustomConverter.class;
-		}
-
-		public XmlConverter getXmlConverter(XmlConverterHolder xmlConverterContainer) {
-			return xmlConverterContainer.getConverter();
-		}
-
-		public OrmEclipseLinkCustomConverter buildConverter(XmlNamedConverter xmlConverter, XmlContextNode parent) {
-			return new OrmEclipseLinkCustomConverter(parent, (XmlConverter) xmlConverter);
-		}
-
-		@Override
-		protected XmlConverter buildXmlConverter() {
-			return EclipseLinkOrmFactory.eINSTANCE.createXmlConverter();
-		}
-
-		@Override
-		public void setXmlConverter(XmlConverterHolder xmlConverterContainer, XmlNamedConverter xmlConverter) {
-			xmlConverterContainer.setConverter((XmlConverter) xmlConverter);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCustomizer.java
deleted file mode 100644
index 7071a3aa08..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkCustomizer.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.internal.utility.JDTTools;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable;
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkCustomizer
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkCustomizer
-{
-	protected String specifiedCustomizerClass;
-	protected String defaultCustomizerClass;
-
-
-	public OrmEclipseLinkCustomizer(EclipseLinkOrmTypeMapping parent) {
-		super(parent);
-		this.specifiedCustomizerClass = this.buildSpecifiedCustomizerClass();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedCustomizerClass_(this.buildSpecifiedCustomizerClass());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDefaultCustomizerClass(this.buildDefaultCustomizerClass());
-	}
-
-
-	// ********** customizer class **********
-
-	public String getCustomizerClass() {
-		return (this.specifiedCustomizerClass != null) ? this.specifiedCustomizerClass : this.defaultCustomizerClass;
-	}
-
-	public String getSpecifiedCustomizerClass() {
-		return this.specifiedCustomizerClass;
-	}
-
-	public void setSpecifiedCustomizerClass(String customizerClass) {
-		if (this.valuesAreDifferent(this.specifiedCustomizerClass, customizerClass)) {
-			XmlClassReference xmlClassRef = this.getXmlCustomizerClassRefForUpdate();
-			this.setSpecifiedCustomizerClass_(customizerClass);
-			xmlClassRef.setClassName(customizerClass);
-			this.removeXmlCustomizerClassRefIfUnset();
-		}
-	}
-
-	protected void setSpecifiedCustomizerClass_(String customizerClass) {
-		String old = this.specifiedCustomizerClass;
-		this.specifiedCustomizerClass = customizerClass;
-		this.firePropertyChanged(SPECIFIED_CUSTOMIZER_CLASS_PROPERTY, old, customizerClass);
-	}
-
-	protected String buildSpecifiedCustomizerClass() {
-		XmlClassReference xmlClassRef = this.getXmlCustomizerClassRef();
-		return (xmlClassRef == null) ? null : xmlClassRef.getClassName();
-	}
-
-	public String getDefaultCustomizerClass() {
-		return this.defaultCustomizerClass;
-	}
-
-	protected void setDefaultCustomizerClass(String customizerClass) {
-		String old = this.defaultCustomizerClass;
-		this.defaultCustomizerClass = customizerClass;
-		this.firePropertyChanged(DEFAULT_CUSTOMIZER_CLASS_PROPERTY, old, customizerClass);
-	}
-
-	protected String buildDefaultCustomizerClass() {
-		JavaEclipseLinkCustomizer javaCustomizer = this.getJavaCustomizerForDefaults();
-		return (javaCustomizer == null) ? null : javaCustomizer.getFullyQualifiedCustomizerClass();
-	}
-
-
-	// ********** xml customizer class ref **********
-
-	/**
-	 * Return null if the XML class ref does not exists.
-	 */
-	protected XmlClassReference getXmlCustomizerClassRef() {
-		return this.getXmlCustomizerHolder().getCustomizer();
-	}
-
-	/**
-	 * Build the XML class ref if it does not exist.
-	 */
-	protected XmlClassReference getXmlCustomizerClassRefForUpdate() {
-		XmlClassReference xmlClassRef = this.getXmlCustomizerClassRef();
-		return (xmlClassRef != null) ? xmlClassRef : this.buildXmlCustomizerClassRef();
-	}
-
-	protected XmlClassReference buildXmlCustomizerClassRef() {
-		XmlClassReference ref = OrmFactory.eINSTANCE.createXmlClassReference();
-		this.getXmlCustomizerHolder().setCustomizer(ref);
-		return ref;
-	}
-
-	protected void removeXmlCustomizerClassRefIfUnset() {
-		if (this.getXmlCustomizerClassRef().isUnset()) {
-			this.removeXmlCustomizerClassRef();
-		}
-	}
-
-	protected void removeXmlCustomizerClassRef() {
-		this.getXmlCustomizerHolder().setCustomizer(null);
-	}
-
-	protected JavaResourceAbstractType getResourceCustomizerType() {
-		XmlClassReference customizerClassRef = this.getXmlCustomizerClassRef();
-		if (customizerClassRef == null) {
-			return null;
-		}
-
-		String className = customizerClassRef.getClassName();
-		if (className == null) {
-			return null;
-		}
-
-		return this.getEntityMappings().resolveJavaResourceType(className);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public EclipseLinkOrmTypeMapping getParent() {
-		return (EclipseLinkOrmTypeMapping) super.getParent();
-	}
-
-	protected EclipseLinkOrmTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected XmlTypeMapping getXmlTypeMapping() {
-		return this.getTypeMapping().getXmlTypeMapping();
-	}
-
-	protected XmlCustomizerHolder getXmlCustomizerHolder() {
-		return (XmlCustomizerHolder) this.getXmlTypeMapping();
-	}
-
-	protected EclipseLinkJavaTypeMapping getJavaTypeMappingForDefaults() {
-		return this.getTypeMapping().getJavaTypeMappingForDefaults();
-	}
-
-	protected JavaEclipseLinkCustomizer getJavaCustomizerForDefaults() {
-		EclipseLinkJavaTypeMapping javaTypeMapping = this.getJavaTypeMappingForDefaults();
-		return (javaTypeMapping == null) ? null : (JavaEclipseLinkCustomizer) javaTypeMapping.getCustomizer();
-	}
-
-	protected EntityMappings getEntityMappings() {
-		return this.getMappingFileRoot();
-	}
-
-	protected boolean isFor(String typeName) {
-		JavaResourceAbstractType customizerType = this.getResourceCustomizerType();
-		return (customizerType != null) && customizerType.getQualifiedName().equals(typeName);
-	}
-
-	protected boolean isIn(IPackageFragment packageFragment) {
-		JavaResourceAbstractType customizerType = this.getResourceCustomizerType();
-		return (customizerType != null) && customizerType.isIn(packageFragment);
-	}
-
-	public char getCustomizerClassEnclosingTypeSeparator() {
-		return '$';
-	}
-
-
-	// ********** refactoring **********
-
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return this.isFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameTypeEdit(originalType, newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameTypeEdit(IType originalType, String newName) {
-		return this.getXmlCustomizerClassRef().createRenameEdit(originalType, newName);
-	}
-
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.isFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenamePackageEdit(newPackage.getElementName())) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.isIn(originalPackage) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenamePackageEdit(newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenamePackageEdit(String newName) {
-		return this.getXmlCustomizerClassRef().createRenamePackageEdit(newName);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.validateCustomizerClass(messages);
-	}
-
-	protected void validateCustomizerClass(List<IMessage> messages) {
-		IJavaProject javaProject = this.getPersistenceUnit().getJpaProject().getJavaProject();
-		if (this.getCustomizerClass() != null) {
-			if (StringTools.stringIsEmpty(this.getCustomizerClass())) {
-				messages.add(
-						DefaultEclipseLinkJpaValidationMessages.buildMessage(
-								IMessage.HIGH_SEVERITY,
-								EclipseLinkJpaValidationMessages.DESCRIPTOR_CUSTOMIZER_CLASS_NOT_SPECIFIED,
-								EMPTY_STRING_ARRAY,
-								this,
-								this.getValidationTextRange()
-						)
-				);
-			} else if (JDTTools.findType(javaProject, this.getCustomizerClass()) == null) {
-				messages.add(
-						DefaultEclipseLinkJpaValidationMessages.buildMessage(
-								IMessage.HIGH_SEVERITY,
-								EclipseLinkJpaValidationMessages.DESCRIPTOR_CUSTOMIZER_CLASS_NOT_EXIST,
-								new String[] { this.getCustomizerClass()},
-								this,
-								this.getValidationTextRange()
-						)
-				);
-			} else if (!JDTTools.classHasPublicZeroArgConstructor(javaProject, this.getCustomizerClass())) {
-				messages.add(
-						DefaultEclipseLinkJpaValidationMessages.buildMessage(
-								IMessage.HIGH_SEVERITY,
-								EclipseLinkJpaValidationMessages.DESCRIPTOR_CUSTOMIZER_CLASS_NOT_VALID,
-								new String[] {this.getCustomizerClass()},
-								this,
-								this.getValidationTextRange()
-						)
-				);
-			} else if (!JDTTools.typeIsSubType(javaProject, this.getCustomizerClass(), ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME)) {
-				messages.add(
-						DefaultEclipseLinkJpaValidationMessages.buildMessage(
-								IMessage.HIGH_SEVERITY,
-								EclipseLinkJpaValidationMessages.DESCRIPTOR_CUSTOMIZER_CLASS_IMPLEMENTS_DESCRIPTOR_CUSTOMIZER,
-								new String[] {this.getCustomizerClass()},
-								this,
-								this.getValidationTextRange()
-						)
-				);
-			}
-		}
-	}
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.getXmlValidationTextRange();
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange();
-	}
-
-	protected TextRange getXmlValidationTextRange() {
-		XmlClassReference xmlClassRef = this.getXmlCustomizerClassRef();
-		return (xmlClassRef == null) ? null : xmlClassRef.getClassNameTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddableImpl.java
deleted file mode 100644
index 5ffdb65146..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddableImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.utility.internal.NotNullFilter;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEmbeddable;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkTypeMappingValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * EclipseLink
- * <code>orm.xml</code> embeddable type mapping
- */
-public class OrmEclipseLinkEmbeddableImpl
-	extends AbstractOrmEmbeddable<XmlEmbeddable>
-	implements OrmEclipseLinkEmbeddable
-{
-	protected final OrmEclipseLinkConverterContainer converterContainer;
-
-	protected final OrmEclipseLinkChangeTracking changeTracking;
-
-	protected final OrmEclipseLinkCustomizer customizer;
-
-
-	public OrmEclipseLinkEmbeddableImpl(OrmPersistentType parent, XmlEmbeddable xmlEmbeddable) {
-		super(parent, xmlEmbeddable);
-		this.converterContainer = this.buildConverterContainer();
-		this.changeTracking = this.buildChangeTracking();
-		this.customizer = this.buildCustomizer();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.converterContainer.synchronizeWithResourceModel();
-		this.changeTracking.synchronizeWithResourceModel();
-		this.customizer.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.converterContainer.update();
-		this.changeTracking.update();
-		this.customizer.update();
-	}
-
-
-	// ********** converter container **********
-
-	public OrmEclipseLinkConverterContainer getConverterContainer() {
-		return this.converterContainer;
-	}
-
-	protected OrmEclipseLinkConverterContainer buildConverterContainer() {
-		return new OrmEclipseLinkConverterContainerImpl(this, this.getXmlTypeMapping());
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(
-					this.converterContainer.getConverters(),
-					this.getAttributeMappingConverters()
-				);
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters() {
-		return new FilteringIterable<EclipseLinkConverter>(this.getAttributeMappingConverters_(), NotNullFilter.<EclipseLinkConverter>instance());
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters_() {
-		return new TransformationIterable<AttributeMapping, EclipseLinkConverter>(this.getAttributeMappings(), ATTRIBUTE_MAPPING_CONVERTER_TRANSFORMER);
-	}
-
-
-	// ********** change tracking **********
-
-	public EclipseLinkChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	protected OrmEclipseLinkChangeTracking buildChangeTracking() {
-		return new OrmEclipseLinkChangeTracking(this);
-	}
-
-
-	// ********** customizer **********
-
-	public EclipseLinkCustomizer getCustomizer() {
-		return this.customizer;
-	}
-
-	protected OrmEclipseLinkCustomizer buildCustomizer() {
-		return new OrmEclipseLinkCustomizer(this);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaEclipseLinkEmbeddable getJavaTypeMapping() {
-		return (JavaEclipseLinkEmbeddable) super.getJavaTypeMapping();
-	}
-
-	@Override
-	public JavaEclipseLinkEmbeddable getJavaTypeMappingForDefaults() {
-		return (JavaEclipseLinkEmbeddable) super.getJavaTypeMappingForDefaults();
-	}
-
-	public boolean usesPrimaryKeyColumns() {
-		return false;
-	}
-
-
-	// ********** refactoring **********
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createRenameTypeEdits(originalType, newName),
-				this.createCustomizerRenameTypeEdits(originalType, newName),
-				this.createConverterHolderRenameTypeEdits(originalType, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerRenameTypeEdits(IType originalType, String newName) {
-		return this.customizer.createRenameTypeEdits(originalType, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderRenameTypeEdits(IType originalType, String newName) {
-		return this.converterContainer.createRenameTypeEdits(originalType, newName);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createMoveTypeEdits(originalType, newPackage),
-				this.createCustomizerMoveTypeEdits(originalType, newPackage),
-				this.createConverterHolderMoveTypeEdits(originalType, newPackage)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.customizer.createMoveTypeEdits(originalType, newPackage);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createRenamePackageEdits(originalPackage, newName),
-				this.createCustomizerRenamePackageEdits(originalPackage, newName),
-				this.createConverterHolderRenamePackageEdits(originalPackage, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.customizer.createRenamePackageEdits(originalPackage, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.customizer.validate(messages, reporter);
-		this.changeTracking.validate(messages, reporter);
-		this.converterContainer.validate(messages, reporter);
-	}
-
-	@Override
-	protected JptValidator buildTypeMappingValidator() {
-		return new EclipseLinkTypeMappingValidator(this, getJavaResourceType(), buildTextRangeResolver());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java
deleted file mode 100644
index 1da8146ede..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.common.utility.internal.NotNullFilter;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmEntity;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCacheable_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkEntityPrimaryKeyValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkTypeMappingValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java.EclipseLinkClassExtractorAnnotation2_1;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * EclipseLink
- * <code>orm.xml</code> entity type mapping
- */
-public class OrmEclipseLinkEntityImpl
-	extends AbstractOrmEntity<XmlEntity>
-	implements OrmEclipseLinkEntity
-{
-	protected final OrmEclipseLinkReadOnly readOnly;
-
-	protected final OrmEclipseLinkCustomizer customizer;
-
-	protected final OrmEclipseLinkChangeTracking changeTracking;
-
-	protected final OrmEclipseLinkCaching caching;
-
-	protected final OrmEclipseLinkConverterContainer converterContainer;
-
-
-	public OrmEclipseLinkEntityImpl(OrmPersistentType parent, XmlEntity xmlEntity) {
-		super(parent, xmlEntity);
-		this.caching = this.buildCaching();
-		this.readOnly = this.buildReadOnly();
-		this.converterContainer = this.buildConverterContainer();
-		this.changeTracking = this.buildChangeTracking();
-		this.customizer = this.buildCustomizer();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.caching.synchronizeWithResourceModel();
-		this.readOnly.synchronizeWithResourceModel();
-		this.converterContainer.synchronizeWithResourceModel();
-		this.changeTracking.synchronizeWithResourceModel();
-		this.customizer.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.caching.update();
-		this.readOnly.update();
-		this.converterContainer.update();
-		this.changeTracking.update();
-		this.customizer.update();
-	}
-
-
-	// ********** caching **********
-
-	public OrmEclipseLinkCaching getCaching() {
-		return this.caching;
-	}
-
-	protected OrmEclipseLinkCaching buildCaching() {
-		return new OrmEclipseLinkCachingImpl(this);
-	}
-
-
-	// ********** read only **********
-
-	public OrmEclipseLinkReadOnly getReadOnly() {
-		return this.readOnly;
-	}
-
-	protected OrmEclipseLinkReadOnly buildReadOnly() {
-		return new OrmEclipseLinkReadOnly(this);
-	}
-
-
-	// ********** converter container **********
-
-	public OrmEclipseLinkConverterContainer getConverterContainer() {
-		return this.converterContainer;
-	}
-
-	protected OrmEclipseLinkConverterContainer buildConverterContainer() {
-		return new OrmEclipseLinkConverterContainerImpl(this, this.xmlTypeMapping);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(
-					this.converterContainer.getConverters(),
-					this.getAttributeMappingConverters()
-				);
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters() {
-		return new FilteringIterable<EclipseLinkConverter>(this.getAttributeMappingConverters_(), NotNullFilter.<EclipseLinkConverter>instance());
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters_() {
-		return new TransformationIterable<AttributeMapping, EclipseLinkConverter>(this.getAttributeMappings(), ATTRIBUTE_MAPPING_CONVERTER_TRANSFORMER);
-	}
-
-
-	// ********** change tracking **********
-
-	public EclipseLinkChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	protected OrmEclipseLinkChangeTracking buildChangeTracking() {
-		return new OrmEclipseLinkChangeTracking(this);
-	}
-
-
-	// ********** customizer **********
-
-	public EclipseLinkCustomizer getCustomizer() {
-		return this.customizer;
-	}
-
-	protected OrmEclipseLinkCustomizer buildCustomizer() {
-		return new OrmEclipseLinkCustomizer(this);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaEclipseLinkEntity getJavaTypeMapping() {
-		return (JavaEclipseLinkEntity) super.getJavaTypeMapping();
-	}
-
-	@Override
-	public JavaEclipseLinkEntity getJavaTypeMappingForDefaults() {
-		return (JavaEclipseLinkEntity) super.getJavaTypeMappingForDefaults();
-	}
-
-	public boolean usesPrimaryKeyColumns() {
-		return (this.getXmlTypeMapping().getPrimaryKey() != null)
-				|| this.usesJavaPrimaryKeyColumns();
-	}
-
-	protected boolean usesJavaPrimaryKeyColumns() {
-		JavaEclipseLinkEntity javaEntity = this.getJavaTypeMappingForDefaults();
-		return (javaEntity != null) && javaEntity.usesPrimaryKeyColumns();
-	}
-
-	@Override
-	protected boolean buildSpecifiedDiscriminatorColumnIsAllowed() {
-		return super.buildSpecifiedDiscriminatorColumnIsAllowed() && ! this.classExtractorIsUsed();
-	}
-
-	protected boolean classExtractorIsUsed() {
-		return (this.getXmlClassExtractor() != null) || (this.getClassExtractorAnnotation() != null);
-	}
-
-	protected XmlClassReference getXmlClassExtractor() {
-		return this.getXmlTypeMapping().getClassExtractor();
-	}
-
-	protected EclipseLinkClassExtractorAnnotation2_1 getClassExtractorAnnotation() {
-		if (this.getJavaTypeMappingForDefaults() != null) {
-			JavaResourceType jrpt = this.getJavaPersistentType().getJavaResourceType();
-			return (EclipseLinkClassExtractorAnnotation2_1) jrpt.getAnnotation(EclipseLinkClassExtractorAnnotation2_1.ANNOTATION_NAME);
-		}
-		return null;
-	}
-
-	public OrmCacheable2_0 getCacheable() {
-		return this.getCacheableHolder().getCacheable();
-	}
-
-	public boolean calculateDefaultCacheable() {
-		return this.getCacheableHolder().calculateDefaultCacheable();
-	}
-
-	protected OrmCacheableHolder2_0 getCacheableHolder() {
-		return (OrmCacheableHolder2_0) this.caching;
-	}
-
-	public XmlCacheable_2_0 getXmlCacheable() {
-		return this.getXmlTypeMapping();
-	}
-
-	protected JavaResourceAbstractType getResourceClassExtractorType() {
-		XmlClassReference classExtractorClassRef = this.getXmlClassExtractor();
-		if (classExtractorClassRef == null) {
-			return null;
-		}
-
-		String className = classExtractorClassRef.getClassName();
-		if (className == null) {
-			return null;
-		}
-
-		return this.getMappingFileRoot().resolveJavaResourceType(className);
-	}
-
-	protected boolean classExtractorIsFor(String typeName) {
-		JavaResourceAbstractType classExtractorType = this.getResourceClassExtractorType();
-		return (classExtractorType != null) && classExtractorType.getQualifiedName().equals(typeName);
-	}
-
-	protected boolean classExtractorIsIn(IPackageFragment packageFragment) {
-		JavaResourceAbstractType classExtractorType = this.getResourceClassExtractorType();
-		return (classExtractorType != null) && classExtractorType.isIn(packageFragment);
-	}
-
-
-	// ********** refactoring **********
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createRenameTypeEdits(originalType, newName),
-				this.createCustomizerRenameTypeEdits(originalType, newName),
-				this.createConverterHolderRenameTypeEdits(originalType, newName),
-				this.createClassExtractorRenameTypeEdits(originalType, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerRenameTypeEdits(IType originalType, String newName) {
-		return this.customizer.createRenameTypeEdits(originalType, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderRenameTypeEdits(IType originalType, String newName) {
-		return this.converterContainer.createRenameTypeEdits(originalType, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createClassExtractorRenameTypeEdits(IType originalType, String newName) {
-		return this.classExtractorIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.getXmlClassExtractor().createRenameEdit(originalType, newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createMoveTypeEdits(originalType, newPackage),
-				this.createCustomizerMoveTypeEdits(originalType, newPackage),
-				this.createConverterHolderMoveTypeEdits(originalType, newPackage),
-				this.createClassExtractorMoveTypeEdits(originalType, newPackage)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.customizer.createMoveTypeEdits(originalType, newPackage);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
-	}
-
-	protected Iterable<ReplaceEdit> createClassExtractorMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.classExtractorIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.getXmlClassExtractor().createRenamePackageEdit(newPackage.getElementName())) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createRenamePackageEdits(originalPackage, newName),
-				this.createCustomizerRenamePackageEdits(originalPackage, newName),
-				this.createConverterHolderRenamePackageEdits(originalPackage, newName),
-				this.createClassExtractorRenamePackageEdits(originalPackage, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.customizer.createRenamePackageEdits(originalPackage, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createClassExtractorRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.classExtractorIsIn(originalPackage) ?
-				new SingleElementIterable<ReplaceEdit>(this.getXmlClassExtractor().createRenamePackageEdit(newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.caching.validate(messages, reporter);
-		this.readOnly.validate(messages, reporter);
-		this.converterContainer.validate(messages, reporter);
-		this.changeTracking.validate(messages, reporter);
-		this.customizer.validate(messages, reporter);
-	}
-
-	@Override
-	protected JptValidator buildPrimaryKeyValidator() {
-		return new EclipseLinkEntityPrimaryKeyValidator(this, buildTextRangeResolver());
-	}
-
-	@Override
-	protected JptValidator buildTypeMappingValidator() {
-		return new EclipseLinkTypeMappingValidator(this, getJavaResourceType(), buildTextRangeResolver());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java
deleted file mode 100644
index c0f40771b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmConverter;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmIdMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkIdMapping
-	extends AbstractOrmIdMapping<XmlId>
-	implements EclipseLinkIdMapping
-{
-	protected final OrmEclipseLinkMutable mutable;
-	
-	
-	public OrmEclipseLinkIdMapping(OrmPersistentAttribute parent, XmlId xmlMapping) {
-		super(parent, xmlMapping);
-		this.mutable = new OrmEclipseLinkMutable(this);
-	}
-	
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.mutable.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-
-
-	// ********** mutable **********
-
-	public EclipseLinkMutable getMutable() {
-		return this.mutable;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * put the EclipseLink convert adapter first - this is the order EclipseLink searches
-	 */
-	@Override
-	protected Iterable<OrmConverter.Adapter> getConverterAdapters() {
-		return new CompositeIterable<OrmConverter.Adapter>(OrmEclipseLinkConvert.Adapter.instance(), super.getConverterAdapters());
-	}
-
-
-	// ********** validation **********
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO mutable validation
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkJoinFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkJoinFetch.java
deleted file mode 100644
index c29d55668b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkJoinFetch.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch;
-
-public class OrmEclipseLinkJoinFetch
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkJoinFetch
-{
-	protected EclipseLinkJoinFetchType value;
-
-
-	public OrmEclipseLinkJoinFetch(OrmAttributeMapping parent) {
-		super(parent);
-		this.value = this.buildValue();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** value **********
-
-	public EclipseLinkJoinFetchType getValue() {
-		return this.value;
-	}
-
-	public void setValue(EclipseLinkJoinFetchType value) {
-		this.setValue_(value);
-		this.getXmlJoinFetch().setJoinFetch(EclipseLinkJoinFetchType.toOrmResourceModel(value));
-	}
-
-	protected void setValue_(EclipseLinkJoinFetchType value) {
-		EclipseLinkJoinFetchType old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	protected EclipseLinkJoinFetchType buildValue() {
-		return EclipseLinkJoinFetchType.fromOrmResourceModel(this.getXmlJoinFetch().getJoinFetch());
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public OrmAttributeMapping getParent() {
-		return (OrmAttributeMapping) super.getParent();
-	}
-
-	protected OrmAttributeMapping getAttributeMapping() {
-		return this.getParent();
-	}
-
-	protected XmlAttributeMapping getXmlAttributeMapping() {
-		return this.getAttributeMapping().getXmlAttributeMapping();
-	}
-
-	protected XmlJoinFetch getXmlJoinFetch() {
-		return (XmlJoinFetch) this.getXmlAttributeMapping();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.getXmlValidationTextRange();
-		return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange();
-	}
-
-	protected TextRange getXmlValidationTextRange() {
-		return this.getXmlJoinFetch().getJoinFetchTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java
deleted file mode 100644
index de99c6f6e7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManyToManyMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkManyToManyMapping
-	extends AbstractOrmManyToManyMapping<XmlManyToMany>
-	implements EclipseLinkRelationshipMapping
-{
-	protected final OrmEclipseLinkJoinFetch joinFetch;
-
-
-	public OrmEclipseLinkManyToManyMapping(OrmPersistentAttribute parent, XmlManyToMany xmlMapping) {
-		super(parent, xmlMapping);
-		this.joinFetch = new OrmEclipseLinkJoinFetch(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO join fetch validation
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToOneMapping.java
deleted file mode 100644
index 381c08a5ac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToOneMapping.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManyToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkManyToOneMapping
-	extends AbstractOrmManyToOneMapping<XmlManyToOne>
-	implements EclipseLinkRelationshipMapping
-{
-	protected final OrmEclipseLinkJoinFetch joinFetch;
-
-
-	protected OrmEclipseLinkManyToOneMapping(OrmPersistentAttribute parent, XmlManyToOne xmlMapping) {
-		super(parent, xmlMapping);
-		this.joinFetch = new OrmEclipseLinkJoinFetch(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO - join fetch validation
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java
deleted file mode 100644
index cb24dbe591..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.utility.internal.NotNullFilter;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmMappedSuperclass;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCacheable_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkCaching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkMappedSuperclassPrimaryKeyValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkMappedSuperclassValidator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * EclipseLink
- * <code>orm.xml</code> mapped superclass
- */
-public class OrmEclipseLinkMappedSuperclassImpl
-	extends AbstractOrmMappedSuperclass<XmlMappedSuperclass>
-	implements OrmEclipseLinkMappedSuperclass, OrmCacheableHolder2_0
-{
-	protected final OrmEclipseLinkReadOnly readOnly;
-
-	protected final OrmEclipseLinkCustomizer customizer;
-
-	protected final OrmEclipseLinkChangeTracking changeTracking;
-
-	protected final OrmEclipseLinkCaching caching;
-
-	protected final OrmEclipseLinkConverterContainer converterContainer;
-
-
-	public OrmEclipseLinkMappedSuperclassImpl(OrmPersistentType parent, XmlMappedSuperclass xmlMappedSuperclass) {
-		super(parent, xmlMappedSuperclass);
-		this.caching = this.buildCaching();
-		this.readOnly = this.buildReadOnly();
-		this.converterContainer = this.buildConverterContainer();
-		this.changeTracking = this.buildChangeTracking();
-		this.customizer = this.buildCustomizer();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.caching.synchronizeWithResourceModel();
-		this.readOnly.synchronizeWithResourceModel();
-		this.converterContainer.synchronizeWithResourceModel();
-		this.changeTracking.synchronizeWithResourceModel();
-		this.customizer.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.caching.update();
-		this.readOnly.update();
-		this.converterContainer.update();
-		this.changeTracking.update();
-		this.customizer.update();
-	}
-
-
-	// ********** caching **********
-
-	public OrmEclipseLinkCaching getCaching() {
-		return this.caching;
-	}
-
-	protected OrmEclipseLinkCaching buildCaching() {
-		return new OrmEclipseLinkCachingImpl(this);
-	}
-
-
-	// ********** read only **********
-
-	public OrmEclipseLinkReadOnly getReadOnly() {
-		return this.readOnly;
-	}
-
-	protected OrmEclipseLinkReadOnly buildReadOnly() {
-		return new OrmEclipseLinkReadOnly(this);
-	}
-
-
-	// ********** converter container **********
-
-	public OrmEclipseLinkConverterContainer getConverterContainer() {
-		return this.converterContainer;
-	}
-
-	protected OrmEclipseLinkConverterContainer buildConverterContainer() {
-		return new OrmEclipseLinkConverterContainerImpl(this, this.xmlTypeMapping);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Iterable<EclipseLinkConverter> getConverters() {
-		return new CompositeIterable<EclipseLinkConverter>(
-					this.converterContainer.getConverters(),
-					this.getAttributeMappingConverters()
-				);
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters() {
-		return new FilteringIterable<EclipseLinkConverter>(this.getAttributeMappingConverters_(), NotNullFilter.<EclipseLinkConverter>instance());
-	}
-
-	protected Iterable<EclipseLinkConverter> getAttributeMappingConverters_() {
-		return new TransformationIterable<AttributeMapping, EclipseLinkConverter>(this.getAttributeMappings(), ATTRIBUTE_MAPPING_CONVERTER_TRANSFORMER);
-	}
-
-
-	// ********** change tracking **********
-
-	public EclipseLinkChangeTracking getChangeTracking() {
-		return this.changeTracking;
-	}
-
-	protected OrmEclipseLinkChangeTracking buildChangeTracking() {
-		return new OrmEclipseLinkChangeTracking(this);
-	}
-
-
-	// ********** customizer **********
-
-	public EclipseLinkCustomizer getCustomizer() {
-		return this.customizer;
-	}
-
-	protected OrmEclipseLinkCustomizer buildCustomizer() {
-		return new OrmEclipseLinkCustomizer(this);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public JavaEclipseLinkMappedSuperclass getJavaTypeMapping() {
-		return (JavaEclipseLinkMappedSuperclass) super.getJavaTypeMapping();
-	}
-
-	@Override
-	public JavaEclipseLinkMappedSuperclass getJavaTypeMappingForDefaults() {
-		return (JavaEclipseLinkMappedSuperclass) super.getJavaTypeMappingForDefaults();
-	}
-
-	public boolean usesPrimaryKeyColumns() {
-		return (this.getXmlTypeMapping().getPrimaryKey() != null)
-				|| this.usesJavaPrimaryKeyColumns();
-	}
-
-	protected boolean usesJavaPrimaryKeyColumns() {
-		JavaEclipseLinkMappedSuperclass javaMappedSuperclass = this.getJavaTypeMappingForDefaults();
-		return (javaMappedSuperclass != null) && javaMappedSuperclass.usesPrimaryKeyColumns();
-	}
-
-	public OrmCacheable2_0 getCacheable() {
-		return this.getCacheableHolder().getCacheable();
-	}
-
-	public boolean calculateDefaultCacheable() {
-		return this.getCacheableHolder().calculateDefaultCacheable();
-	}
-
-	protected OrmCacheableHolder2_0 getCacheableHolder() {
-		return (OrmCacheableHolder2_0) this.caching;
-	}
-
-	public XmlCacheable_2_0 getXmlCacheable() {
-		return this.getXmlTypeMapping();
-	}
-
-
-	// ********** refactoring **********
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createRenameTypeEdits(originalType, newName),
-				this.createCustomizerRenameTypeEdits(originalType, newName),
-				this.createConverterHolderRenameTypeEdits(originalType, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerRenameTypeEdits(IType originalType, String newName) {
-		return this.customizer.createRenameTypeEdits(originalType, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderRenameTypeEdits(IType originalType, String newName) {
-		return this.converterContainer.createRenameTypeEdits(originalType, newName);
-	}
-
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createMoveTypeEdits(originalType, newPackage),
-				this.createCustomizerMoveTypeEdits(originalType, newPackage),
-				this.createConverterHolderMoveTypeEdits(originalType, newPackage)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.customizer.createMoveTypeEdits(originalType, newPackage);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				super.createRenamePackageEdits(originalPackage, newName),
-				this.createCustomizerRenamePackageEdits(originalPackage, newName),
-				this.createConverterHolderRenamePackageEdits(originalPackage, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createCustomizerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.customizer.createRenamePackageEdits(originalPackage, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createConverterHolderRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.caching.validate(messages, reporter);
-		this.readOnly.validate(messages, reporter);
-		this.converterContainer.validate(messages, reporter);
-		this.changeTracking.validate(messages, reporter);
-		this.customizer.validate(messages, reporter);
-	}
-
-	@Override
-	protected JptValidator buildPrimaryKeyValidator() {
-		return new EclipseLinkMappedSuperclassPrimaryKeyValidator(this, this.buildTextRangeResolver());
-	}
-
-	@Override
-	protected JptValidator buildTypeMappingValidator() {
-		return new EclipseLinkMappedSuperclassValidator(this, this.getJavaResourceType(), this.buildTextRangeResolver());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMutable.java
deleted file mode 100644
index d993626d2d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMutable.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable;
-
-public class OrmEclipseLinkMutable
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkMutable
-{
-	protected Boolean specifiedMutable;
-	protected boolean defaultMutable;
-
-
-	public OrmEclipseLinkMutable(OrmAttributeMapping parent) {
-		super(parent);
-		this.specifiedMutable = this.buildSpecifiedMutable();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedMutable_(this.buildSpecifiedMutable());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDefaultMutable(this.buildDefaultMutable());
-	}
-
-
-	// ********** mutable **********
-
-	public boolean isMutable() {
-		return (this.specifiedMutable != null) ? this.specifiedMutable.booleanValue() : this.defaultMutable;
-	}
-
-	public Boolean getSpecifiedMutable() {
-		return this.specifiedMutable;
-	}
-
-	public void setSpecifiedMutable(Boolean mutable) {
-		this.setSpecifiedMutable_(mutable);
-		this.getXmlMutable().setMutable(mutable);
-	}
-
-	protected void setSpecifiedMutable_(Boolean mutable) {
-		Boolean old = this.specifiedMutable;
-		this.specifiedMutable = mutable;
-		this.firePropertyChanged(SPECIFIED_MUTABLE_PROPERTY, old, mutable);
-	}
-
-	protected Boolean buildSpecifiedMutable() {
-		return this.getXmlMutable().getMutable();
-	}
-
-	public boolean isDefaultMutable() {
-		return this.defaultMutable;
-	}
-
-	protected void setDefaultMutable(boolean mutable) {
-		boolean old = this.defaultMutable;
-		this.defaultMutable = mutable;
-		this.firePropertyChanged(DEFAULT_MUTABLE_PROPERTY, old, mutable);
-	}
-
-	protected boolean buildDefaultMutable() {
-		JavaEclipseLinkPersistentAttribute javaAttribute = this.getJavaPersistentAttribute();
-		if (javaAttribute == null) {
-			return false;
-		}
-		if (javaAttribute.typeIsDateOrCalendar()) {
-			Boolean puTemporalMutable = this.getPersistenceUnit().getOptions().getTemporalMutable();
-			return (puTemporalMutable == null) ? false : puTemporalMutable.booleanValue();
-		}
-		return javaAttribute.typeIsSerializable();
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public OrmAttributeMapping getParent() {
-		return (OrmAttributeMapping) super.getParent();
-	}
-
-	protected OrmAttributeMapping getAttributeMapping() {
-		return this.getParent();
-	}
-
-	protected XmlMutable getXmlMutable() {
-		return (XmlMutable) this.getAttributeMapping().getXmlAttributeMapping();
-	}
-
-	protected JavaEclipseLinkPersistentAttribute getJavaPersistentAttribute() {
-		return (JavaEclipseLinkPersistentAttribute) this.getAttributeMapping().getPersistentAttribute().getJavaPersistentAttribute();
-	}
-
-	@Override
-	public EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.getXmlValidationTextRange();
-		return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange();
-	}
-
-	protected TextRange getXmlValidationTextRange() {
-		return this.getXmlMutable().getMutableTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkObjectTypeConverter.java
deleted file mode 100644
index 6022044fda..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkObjectTypeConverter.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConversionValue;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkObjectTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkObjectTypeConverter
-	extends OrmEclipseLinkConverter<XmlObjectTypeConverter>
-	implements EclipseLinkObjectTypeConverter
-{
-	private String dataType;
-
-	private String objectType;
-
-
-	protected final ContextListContainer<OrmEclipseLinkConversionValue, XmlConversionValue> conversionValueContainer;
-
-	private String defaultObjectValue;
-
-
-	public OrmEclipseLinkObjectTypeConverter(XmlContextNode parent, XmlObjectTypeConverter xmlConverter) {
-		super(parent, xmlConverter);
-		this.dataType = xmlConverter.getDataType();
-		this.objectType = xmlConverter.getObjectType();
-		this.conversionValueContainer = this.buildConversionValueContainer();
-		this.defaultObjectValue = xmlConverter.getDefaultObjectValue();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setDataType_(this.xmlConverter.getDataType());
-		this.setObjectType_(this.xmlConverter.getObjectType());
-		this.syncConversionValues();
-		this.setDefaultObjectValue_(this.xmlConverter.getDefaultObjectValue());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.updateConversionValues();
-	}
-
-
-	// ********** data type **********
-
-	public String getDataType() {
-		return this.dataType;
-	}
-
-	public void setDataType(String dataType) {
-		this.setDataType_(dataType);
-		this.xmlConverter.setDataType(dataType);
-	}
-
-	protected void setDataType_(String dataType) {
-		String old = this.dataType;
-		this.dataType = dataType;
-		this.firePropertyChanged(DATA_TYPE_PROPERTY, old, dataType);
-	}
-
-	protected boolean dataTypeIsFor(String typeName) {
-		return this.typeIsFor(this.getDataTypeJavaResourceType(), typeName);
-	}
-
-	protected boolean dataTypeIsIn(IPackageFragment packageFragment) {
-		return this.typeIsIn(this.getDataTypeJavaResourceType(), packageFragment);
-	}
-
-	protected JavaResourceAbstractType getDataTypeJavaResourceType() {
-		return this.getMappingFileRoot().resolveJavaResourceType(this.getDataType());
-	}
-
-
-	// ********** object type **********
-
-	public String getObjectType() {
-		return this.objectType;
-	}
-
-	public void setObjectType(String objectType) {
-		this.setObjectType_(objectType);
-		this.xmlConverter.setObjectType(objectType);
-	}
-
-	protected void setObjectType_(String objectType) {
-		String old = this.objectType;
-		this.objectType = objectType;
-		this.firePropertyChanged(OBJECT_TYPE_PROPERTY, old, objectType);
-	}
-
-	protected boolean objectTypeIsFor(String typeName) {
-		return this.typeIsFor(this.getObjectTypeJavaResourceType(), typeName);
-	}
-
-	protected boolean objectTypeIsIn(IPackageFragment packageFragment) {
-		return this.typeIsIn(this.getObjectTypeJavaResourceType(), packageFragment);
-	}
-
-	protected JavaResourceAbstractType getObjectTypeJavaResourceType() {
-		return this.getMappingFileRoot().resolveJavaResourceType(this.getObjectType());
-	}
-
-
-	// ********** conversion values **********
-
-	public ListIterable<OrmEclipseLinkConversionValue> getConversionValues() {
-		return this.conversionValueContainer.getContextElements();
-	}
-
-	public int getConversionValuesSize() {
-		return this.conversionValueContainer.getContextElementsSize();
-	}
-
-	public OrmEclipseLinkConversionValue addConversionValue() {
-		return this.addConversionValue(this.getConversionValuesSize());
-	}
-
-	public OrmEclipseLinkConversionValue addConversionValue(int index) {
-		XmlConversionValue xmlConversionValue = this.buildXmlConversionValue();
-		OrmEclipseLinkConversionValue conversionValue = this.conversionValueContainer.addContextElement(index, xmlConversionValue);
-		this.xmlConverter.getConversionValues().add(index, xmlConversionValue);
-		return conversionValue;
-	}
-
-	protected XmlConversionValue buildXmlConversionValue() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlConversionValue();
-	}
-
-	public void removeConversionValue(EclipseLinkConversionValue conversionValue) {
-		this.removeConversionValue(this.conversionValueContainer.indexOfContextElement((OrmEclipseLinkConversionValue) conversionValue));
-	}
-
-	public void removeConversionValue(int index) {
-		this.conversionValueContainer.removeContextElement(index);
-		this.xmlConverter.getConversionValues().remove(index);
-	}
-
-	public void moveConversionValue(int targetIndex, int sourceIndex) {
-		this.conversionValueContainer.moveContextElement(targetIndex, sourceIndex);
-		this.xmlConverter.getConversionValues().move(targetIndex, sourceIndex);
-	}
-
-
-	protected OrmEclipseLinkConversionValue buildConversionValue(XmlConversionValue xmlConversionValue) {
-		return new OrmEclipseLinkConversionValue(this, xmlConversionValue);
-	}
-
-	protected void syncConversionValues() {
-		this.conversionValueContainer.synchronizeWithResourceModel();
-	}
-
-	protected void updateConversionValues() {
-		this.conversionValueContainer.update();
-	}
-
-	protected ListIterable<XmlConversionValue> getXmlConversionValues() {
-		// clone to reduce chance of concurrency problems
-		return new LiveCloneListIterable<XmlConversionValue>(this.xmlConverter.getConversionValues());
-	}
-
-	protected ContextListContainer<OrmEclipseLinkConversionValue, XmlConversionValue> buildConversionValueContainer() {
-		return new ConversionValueContainer();
-	}
-
-	/**
-	 * conversion value container
-	 */
-	protected class ConversionValueContainer
-			extends ContextListContainer<OrmEclipseLinkConversionValue, XmlConversionValue> {
-		
-		@Override
-		protected String getContextElementsPropertyName() {
-			return CONVERSION_VALUES_LIST;
-		}
-		
-		@Override
-		protected OrmEclipseLinkConversionValue buildContextElement(XmlConversionValue resourceElement) {
-			return OrmEclipseLinkObjectTypeConverter.this.buildConversionValue(resourceElement);
-		}
-		
-		@Override
-		protected ListIterable<XmlConversionValue> getResourceElements() {
-			return OrmEclipseLinkObjectTypeConverter.this.getXmlConversionValues();
-		}
-		
-		@Override
-		protected XmlConversionValue getResourceElement(OrmEclipseLinkConversionValue contextElement) {
-			return contextElement.getXmlConversionValue();
-		}
-	}
-
-
-	// ********** data values **********
-
-	public Iterable<String> getDataValues() {
-		return new TransformationIterable<OrmEclipseLinkConversionValue, String>(this.getConversionValues()) {
-			@Override
-			protected String transform(OrmEclipseLinkConversionValue conversionValue) {
-				return conversionValue.getDataValue();
-			}
-		};
-	}
-
-	public int getDataValuesSize() {
-		return this.getConversionValuesSize();
-	}
-
-
-	// ********** default object value **********
-
-	public String getDefaultObjectValue() {
-		return this.defaultObjectValue;
-	}
-
-	public void setDefaultObjectValue(String value) {
-		this.setDefaultObjectValue_(value);
-		this.xmlConverter.setDefaultObjectValue(value);
-	}
-
-	protected void setDefaultObjectValue_(String value) {
-		String old = this.defaultObjectValue;
-		this.defaultObjectValue = value;
-		this.firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, old, value);
-	}
-
-
-	// ********** misc **********
-
-	public Class<EclipseLinkObjectTypeConverter> getType() {
-		return EclipseLinkObjectTypeConverter.class;
-	}
-
-	protected boolean typeIsFor(JavaResourceAbstractType type, String typeName) {
-		return (type != null) && type.getQualifiedName().equals(typeName);
-	}
-
-	protected boolean typeIsIn(JavaResourceAbstractType type, IPackageFragment packageFragment) {
-		return (type != null) && type.isIn(packageFragment);
-	}
-
-
-	// ********** refactoring **********
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createRenameDataTypeEdits(originalType, newName),
-				this.createRenameObjectTypeEdits(originalType, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameDataTypeEdits(IType originalType, String newName) {
-		return this.dataTypeIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameDataTypeEdit(originalType, newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameDataTypeEdit(IType originalType, String newName) {
-		return this.xmlConverter.createRenameDataTypeEdit(originalType, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameObjectTypeEdits(IType originalType, String newName) {
-		return this.objectTypeIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameObjectTypeEdit(originalType, newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameObjectTypeEdit(IType originalType, String newName) {
-		return this.xmlConverter.createRenameObjectTypeEdit(originalType, newName);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createMoveDataTypeEdits(originalType, newPackage),
-				this.createMoveObjectTypeEdits(originalType, newPackage)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createMoveDataTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.dataTypeIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameDataTypePackageEdit(newPackage.getElementName())) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameDataTypePackageEdit(String newName) {
-		return this.xmlConverter.createRenameDataTypePackageEdit(newName);
-	}
-
-	protected Iterable<ReplaceEdit> createMoveObjectTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.objectTypeIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameObjectTypePackageEdit(newPackage.getElementName())) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameObjectTypePackageEdit(String newName) {
-		return this.xmlConverter.createRenameObjectTypePackageEdit(newName);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createRenameDataTypePackageEdits(originalPackage, newName),
-				this.createRenameObjectTypePackageEdits(originalPackage, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameDataTypePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.dataTypeIsIn(originalPackage) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameDataTypePackageEdit(newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected Iterable<ReplaceEdit> createRenameObjectTypePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.objectTypeIsIn(originalPackage) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameObjectTypePackageEdit(newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		this.checkForDuplicateDataValues(messages);
-		for (OrmEclipseLinkConversionValue conversionValue : this.getConversionValues()) {
-			conversionValue.validate(messages, reporter);
-		}
-	}
-
-	protected void checkForDuplicateDataValues(List<IMessage> messages) {
-		for (ArrayList<OrmEclipseLinkConversionValue> dups : this.mapConversionValuesByDataValue().values()) {
-			if (dups.size() > 1) {
-				for (OrmEclipseLinkConversionValue dup : dups) {
-					messages.add(
-						DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE,
-							new String[] {dup.getDataValue()},
-							this,
-							dup.getDataValueTextRange()
-						)
-					);
-				}
-			}
-		}
-	}
-
-	protected HashMap<String, ArrayList<OrmEclipseLinkConversionValue>> mapConversionValuesByDataValue() {
-		HashMap<String, ArrayList<OrmEclipseLinkConversionValue>> map = new HashMap<String, ArrayList<OrmEclipseLinkConversionValue>>(this.getConversionValuesSize());
-		for (OrmEclipseLinkConversionValue conversionValue : this.getConversionValues()) {
-			String dataValue = conversionValue.getDataValue();
-			ArrayList<OrmEclipseLinkConversionValue> list = map.get(dataValue);
-			if (list == null) {
-				list = new ArrayList<OrmEclipseLinkConversionValue>();
-				map.put(dataValue, list);
-			}
-			list.add(conversionValue);
-		}
-		return map;
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<EclipseLinkObjectTypeConverter> getConverterType() {
-			return EclipseLinkObjectTypeConverter.class;
-		}
-
-		public XmlObjectTypeConverter getXmlConverter(XmlConverterHolder xmlConverterContainer) {
-			return xmlConverterContainer.getObjectTypeConverter();
-		}
-
-		public OrmEclipseLinkConverter<? extends XmlNamedConverter> buildConverter(XmlNamedConverter xmlConverter, XmlContextNode parent) {
-			return new OrmEclipseLinkObjectTypeConverter(parent, (XmlObjectTypeConverter) xmlConverter);
-		}
-
-		@Override
-		protected XmlObjectTypeConverter buildXmlConverter() {
-			return EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverter();
-		}
-
-		@Override
-		protected void setXmlConverter(XmlConverterHolder xmlConverterContainer, XmlNamedConverter xmlConverter) {
-			xmlConverterContainer.setObjectTypeConverter((XmlObjectTypeConverter) xmlConverter);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java
deleted file mode 100644
index f99c9d589c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmOneToManyMapping;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToManyRelationship2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.EclipseLinkOneToManyMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.orm.EclipseLinkOrmOneToManyRelationship2_0;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkOneToManyMapping
-	extends AbstractOrmOneToManyMapping<XmlOneToMany>
-	implements EclipseLinkOneToManyMapping2_0
-{
-	protected final OrmEclipseLinkPrivateOwned privateOwned;
-
-	protected final OrmEclipseLinkJoinFetch joinFetch;
-
-
-	public OrmEclipseLinkOneToManyMapping(OrmPersistentAttribute parent, XmlOneToMany xmlMapping) {
-		super(parent, xmlMapping);
-		this.privateOwned = new OrmEclipseLinkPrivateOwned(this);
-		this.joinFetch = new OrmEclipseLinkJoinFetch(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.privateOwned.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.privateOwned.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** private owned **********
-
-	public EclipseLinkPrivateOwned getPrivateOwned() {
-		return this.privateOwned;
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-
-	// ********** relationship **********
-
-	@Override
-	protected OrmOneToManyRelationship2_0 buildRelationship() {
-		return new EclipseLinkOrmOneToManyRelationship(this);
-	}
-
-	@Override
-	public EclipseLinkOrmOneToManyRelationship2_0 getRelationship() {
-		return (EclipseLinkOrmOneToManyRelationship) super.getRelationship();
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO - private owned, join fetch validation
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToOneMapping.java
deleted file mode 100644
index fba126803e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToOneMapping.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmOneToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkOneToOneMapping
-	extends AbstractOrmOneToOneMapping<XmlOneToOne>
-	implements EclipseLinkOneToOneMapping
-{
-	protected final OrmEclipseLinkPrivateOwned privateOwned;
-
-	protected final OrmEclipseLinkJoinFetch joinFetch;
-
-
-	protected OrmEclipseLinkOneToOneMapping(OrmPersistentAttribute parent, XmlOneToOne xmlMapping) {
-		super(parent, xmlMapping);
-		this.privateOwned = new OrmEclipseLinkPrivateOwned(this);
-		this.joinFetch = new OrmEclipseLinkJoinFetch(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.privateOwned.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.privateOwned.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** private owned **********
-
-	public EclipseLinkPrivateOwned getPrivateOwned() {
-		return this.privateOwned;
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO - private owned, join fetch validation
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java
deleted file mode 100644
index 4ef272741f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitDefaults.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitMetadata;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmPersistenceUnitDefaults;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults;
-
-/**
- * EclipseLink <code>orm.xml</code> file
- * <br>
- * <code>persistence-unit-defaults</code> element
- */
-public class OrmEclipseLinkPersistenceUnitDefaults
-	extends AbstractOrmPersistenceUnitDefaults
-{
-
-
-	// ********** constructor/initialization **********
-
-	public OrmEclipseLinkPersistenceUnitDefaults(OrmPersistenceUnitMetadata parent) {
-		super(parent);
-	}
-
-	@Override
-	protected XmlPersistenceUnitDefaults buildXmlPersistenceUnitDefaults() {
-		return EclipseLinkOrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults();
-	}
-
-}
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
deleted file mode 100644
index 2139546ae9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistenceUnitMetadata.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-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.resource.orm.EclipseLinkOrmPackage;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata;
-
-/**
- * <code>eclipselink orm.xml</code> file
- * <br>
- * <code>persistence-unit-metadata</code> element
- */
-public class OrmEclipseLinkPersistenceUnitMetadata
-	extends AbstractOrmPersistenceUnitMetadata
-{
-
-	public OrmEclipseLinkPersistenceUnitMetadata(EntityMappings parent) {
-		super(parent);
-	}
-	
-	@Override
-	protected XmlPersistenceUnitMetadata buildXmlPersistenceUnitMetadata_() {
-		return EmfTools.create(
-				this.getResourceNodeFactory(),
-				EclipseLinkOrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata(),
-				XmlPersistenceUnitMetadata.class
-			);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistentAttribute.java
deleted file mode 100644
index 1088105f4d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPersistentAttribute.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
-import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
-import org.eclipse.jpt.jpa.core.internal.context.orm.SpecifiedOrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkPersistentAttributeValidator;
-
-/**
- * EclipseLink
- * <code>orm.xml</code> persistent attribute
- */
-public class OrmEclipseLinkPersistentAttribute
-	extends SpecifiedOrmPersistentAttribute
-{
-	public OrmEclipseLinkPersistentAttribute(OrmPersistentType parent, XmlAttributeMapping xmlMapping) {
-		super(parent, xmlMapping);
-	}
-	
-	// ********** validation **********
-
-	@Override
-	protected JptValidator buildAttibuteValidator() {
-		return new EclipseLinkPersistentAttributeValidator(this, buildTextRangeResolver());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPrivateOwned.java
deleted file mode 100644
index 4b5d9640b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkPrivateOwned.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned;
-
-public class OrmEclipseLinkPrivateOwned
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkPrivateOwned
-{
-	protected boolean privateOwned;
-
-
-	public OrmEclipseLinkPrivateOwned(OrmAttributeMapping parent) {
-		super(parent);
-		this.privateOwned = this.buildPrivateOwned();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setPrivateOwned_(this.buildPrivateOwned());
-	}
-
-
-	// ********** private owned **********
-
-	public boolean isPrivateOwned() {
-		return this.privateOwned;
-	}
-
-	public void setPrivateOwned(boolean privateOwned) {
-		this.setPrivateOwned_(privateOwned);
-		this.getXmlPrivateOwned().setPrivateOwned(privateOwned);
-	}
-
-	protected void setPrivateOwned_(boolean privateOwned) {
-		boolean old = this.privateOwned;
-		this.privateOwned = privateOwned;
-		this.firePropertyChanged(PRIVATE_OWNED_PROPERTY, old, privateOwned);
-	}
-
-	protected boolean buildPrivateOwned() {
-		return this.getXmlPrivateOwned().isPrivateOwned();
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public OrmAttributeMapping getParent() {
-		return (OrmAttributeMapping) super.getParent();
-	}
-
-	protected OrmAttributeMapping getAttributeMapping() {
-		return this.getParent();
-	}
-
-	protected XmlAttributeMapping getXmlAttributeMapping() {
-		return this.getAttributeMapping().getXmlAttributeMapping();
-	}
-
-	protected XmlPrivateOwned getXmlPrivateOwned() {
-		return (XmlPrivateOwned) this.getXmlAttributeMapping();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.getXmlValidationTextRange();
-		return (textRange != null) ? textRange : this.getAttributeMapping().getValidationTextRange();
-	}
-
-	protected TextRange getXmlValidationTextRange() {
-		return this.getXmlPrivateOwned().getPrivateOwnedTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkReadOnly.java
deleted file mode 100644
index 35ecc5d959..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkReadOnly.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkReadOnly;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkNonEmbeddableTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkNonEmbeddableTypeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly;
-
-public class OrmEclipseLinkReadOnly
-	extends AbstractOrmXmlContextNode
-	implements EclipseLinkReadOnly
-{
-	protected Boolean specifiedReadOnly;
-	protected boolean defaultReadOnly;
-
-
-	public OrmEclipseLinkReadOnly(OrmEclipseLinkNonEmbeddableTypeMapping parent) {
-		super(parent);
-		this.specifiedReadOnly = this.buildSpecifiedReadOnly();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setSpecifiedReadOnly_(this.buildSpecifiedReadOnly());
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDefaultReadOnly(this.buildDefaultReadOnly());
-	}
-
-
-	// ********** read-only **********
-
-	public boolean isReadOnly() {
-		return (this.specifiedReadOnly != null) ? this.specifiedReadOnly.booleanValue() : this.defaultReadOnly;
-	}
-
-	public Boolean getSpecifiedReadOnly() {
-		return this.specifiedReadOnly;
-	}
-
-	public void setSpecifiedReadOnly(Boolean readOnly) {
-		this.setSpecifiedReadOnly_(readOnly);
-		this.getXmlReadOnly().setReadOnly(readOnly);
-	}
-
-	protected void setSpecifiedReadOnly_(Boolean readOnly) {
-		Boolean old = this.specifiedReadOnly;
-		this.specifiedReadOnly = readOnly;
-		this.firePropertyChanged(SPECIFIED_READ_ONLY_PROPERTY, old, readOnly);
-	}
-
-	protected Boolean buildSpecifiedReadOnly() {
-		return this.getXmlReadOnly().getReadOnly();
-	}
-
-	public boolean isDefaultReadOnly() {
-		return this.defaultReadOnly;
-	}
-
-	protected void setDefaultReadOnly(boolean readOnly) {
-		boolean old = this.defaultReadOnly;
-		this.defaultReadOnly = readOnly;
-		this.firePropertyChanged(DEFAULT_READ_ONLY_PROPERTY, old, readOnly);
-	}
-
-	protected boolean buildDefaultReadOnly() {
-		EclipseLinkReadOnly javaReadOnly = this.getJavaReadOnlyForDefaults();
-		return (javaReadOnly != null) ? javaReadOnly.isReadOnly() : DEFAULT_READ_ONLY;
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public OrmEclipseLinkNonEmbeddableTypeMapping getParent() {
-		return (OrmEclipseLinkNonEmbeddableTypeMapping) super.getParent();
-	}
-
-	protected OrmEclipseLinkNonEmbeddableTypeMapping getTypeMapping() {
-		return this.getParent();
-	}
-
-	protected XmlTypeMapping getXmlTypeMapping() {
-		return this.getTypeMapping().getXmlTypeMapping();
-	}
-
-	protected XmlReadOnly getXmlReadOnly() {
-		return (XmlReadOnly) this.getXmlTypeMapping();
-	}
-
-	protected JavaEclipseLinkNonEmbeddableTypeMapping getJavaTypeMappingForDefaults() {
-		return this.getTypeMapping().getJavaTypeMappingForDefaults();
-	}
-
-	protected EclipseLinkReadOnly getJavaReadOnlyForDefaults() {
-		JavaEclipseLinkNonEmbeddableTypeMapping javaTypeMapping = this.getJavaTypeMappingForDefaults();
-		return (javaTypeMapping == null) ? null : javaTypeMapping.getReadOnly();
-	}
-
-
-	// ********** validation **********
-
-	public TextRange getValidationTextRange() {
-		TextRange textRange = this.getXmlValidationTextRange();
-		return (textRange != null) ? textRange : this.getTypeMapping().getValidationTextRange();
-	}
-
-	protected TextRange getXmlValidationTextRange() {
-		return this.getXmlReadOnly().getReadOnlyTextRange();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructConverter.java
deleted file mode 100644
index 0b5db90e42..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructConverter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-
-public class OrmEclipseLinkStructConverter
-	extends OrmEclipseLinkConverterClassConverter<XmlStructConverter>
-	implements EclipseLinkStructConverter
-{
-	public OrmEclipseLinkStructConverter(XmlContextNode parent, XmlStructConverter xmlConverter) {
-		super(parent, xmlConverter, xmlConverter.getConverter());
-	}
-
-
-	// ********** converter class **********
-
-	@Override
-	protected String getXmlConverterClass() {
-		return this.xmlConverter.getConverter();
-	}
-
-	@Override
-	protected void setXmlConverterClass(String converterClass) {
-		this.xmlConverter.setConverter(converterClass);
-	}
-
-
-	// ********** misc **********
-
-	public Class<EclipseLinkStructConverter> getType() {
-		return EclipseLinkStructConverter.class;
-	}
-
-
-	// ********** refactoring **********
-
-	@Override
-	protected ReplaceEdit createRenameEdit(IType originalType, String newName) {
-		return this.xmlConverter.createRenameEdit(originalType, newName);
-	}
-
-	@Override
-	protected ReplaceEdit createRenamePackageEdit(String newName) {
-		return this.xmlConverter.createRenamePackageEdit(newName);
-	}
-	
-
-	// ********** validation **********
-	
-	@Override
-	protected String getEclipseLinkConverterInterface() {
-		return ECLIPSELINK_STRUCT_CONVERTER_CLASS_NAME;
-	}
-
-	@Override
-	protected String getEclipseLinkConverterInterfaceErrorMessage() {
-		return EclipseLinkJpaValidationMessages.STRUCT_CONVERTER_CLASS_IMPLEMENTS_STRUCT_CONVERTER;
-	}
-
-	@Override
-	protected TextRange getXmlConverterClassTextRange() {
-		return this.xmlConverter.getConverterClassTextRange();
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<EclipseLinkStructConverter> getConverterType() {
-			return EclipseLinkStructConverter.class;
-		}
-
-		public XmlStructConverter getXmlConverter(XmlConverterHolder xmlConverterContainer) {
-			return xmlConverterContainer.getStructConverter();
-		}
-
-		public OrmEclipseLinkStructConverter buildConverter(XmlNamedConverter xmlConverter, XmlContextNode parent) {
-			return new OrmEclipseLinkStructConverter(parent, (XmlStructConverter) xmlConverter);
-		}
-
-		@Override
-		protected XmlStructConverter buildXmlConverter() {
-			return EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverter();
-		}
-
-		@Override
-		public void setXmlConverter(XmlConverterHolder xmlConverterContainer, XmlNamedConverter xmlConverter) {
-			xmlConverterContainer.setStructConverter((XmlStructConverter) xmlConverter);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMapping.java
deleted file mode 100644
index de3ed85c22..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMapping.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation;
-
-public class OrmEclipseLinkTransformationMapping
-	extends AbstractOrmAttributeMapping<XmlTransformation> 
-	implements EclipseLinkTransformationMapping
-{
-	public OrmEclipseLinkTransformationMapping(OrmPersistentAttribute parent, XmlTransformation xmlMapping) {
-		super(parent, xmlMapping);
-	}
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public int getXmlSequence() {
-		return 85;
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-	
-	public void addXmlAttributeMappingTo(org.eclipse.jpt.jpa.core.resource.orm.Attributes xmlAttributes) {
-		((Attributes) xmlAttributes).getTransformations().add(this.xmlAttributeMapping);
-	}
-	
-	public void removeXmlAttributeMappingFrom(org.eclipse.jpt.jpa.core.resource.orm.Attributes xmlAttributes) {
-		((Attributes) xmlAttributes).getTransformations().remove(this.xmlAttributeMapping);
-	}
-}
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
deleted file mode 100644
index aec93cdb79..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.ecore.EFactory;
-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;
-
-public class OrmEclipseLinkTransformationMappingDefinition
-	implements OrmAttributeMappingDefinition
-{
-	// singleton
-	private static final OrmEclipseLinkTransformationMappingDefinition INSTANCE = 
-			new OrmEclipseLinkTransformationMappingDefinition();
-	
-	
-	/**
-	 * Return the singleton
-	 */
-	public static OrmAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private OrmEclipseLinkTransformationMappingDefinition() {
-		super();
-	}
-	
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping(EFactory factory) {
-		return EmfTools.create(
-				factory, 
-				EclipseLinkOrmPackage.eINSTANCE.getXmlTransformation(), 
-				XmlTransformation.class);
-	}
-	
-	public OrmAttributeMapping buildContextMapping(
-			OrmPersistentAttribute parent, 
-			XmlAttributeMapping resourceMapping, 
-			OrmXmlContextNodeFactory factory) {
-		return ((EclipseLinkOrmXmlContextNodeFactory) factory).
-				buildOrmEclipseLinkTransformationMapping(parent, (XmlTransformation) resourceMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTypeConverter.java
deleted file mode 100644
index 958441b079..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTypeConverter.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter;
-import org.eclipse.text.edits.ReplaceEdit;
-
-public class OrmEclipseLinkTypeConverter
-	extends OrmEclipseLinkConverter<XmlTypeConverter>
-	implements EclipseLinkTypeConverter
-{
-	private String dataType;
-
-	private String objectType;
-
-
-	public OrmEclipseLinkTypeConverter(XmlContextNode parent, XmlTypeConverter xmlConverter) {
-		super(parent, xmlConverter);
-		this.dataType = xmlConverter.getDataType();
-		this.objectType = xmlConverter.getObjectType();
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.setDataType_(this.xmlConverter.getDataType());
-		this.setObjectType_(this.xmlConverter.getObjectType());
-	}
-
-
-	// ********** data type **********
-
-	public String getDataType() {
-		return this.dataType;
-	}
-
-	public void setDataType(String dataType) {
-		this.setDataType_(dataType);
-		this.xmlConverter.setDataType(dataType);
-	}
-
-	protected void setDataType_(String dataType) {
-		String old = this.dataType;
-		this.dataType = dataType;
-		this.firePropertyChanged(DATA_TYPE_PROPERTY, old, dataType);
-	}
-
-	protected boolean dataTypeIsFor(String typeName) {
-		return this.typeIsFor(this.getDataTypeJavaResourceType(), typeName);
-	}
-
-	protected boolean dataTypeIsIn(IPackageFragment packageFragment) {
-		return this.typeIsIn(this.getDataTypeJavaResourceType(), packageFragment);
-	}
-
-	protected JavaResourceAbstractType getDataTypeJavaResourceType() {
-		return this.getMappingFileRoot().resolveJavaResourceType(this.dataType);
-	}
-
-
-	// ********** object type **********
-
-	public String getObjectType() {
-		return this.objectType;
-	}
-
-	public void setObjectType(String objectType) {
-		this.setObjectType_(objectType);
-		this.xmlConverter.setObjectType(objectType);
-	}
-
-	protected void setObjectType_(String objectType) {
-		String old = this.objectType;
-		this.objectType = objectType;
-		this.firePropertyChanged(OBJECT_TYPE_PROPERTY, old, objectType);
-	}
-
-	protected boolean objectTypeIsFor(String typeName) {
-		return this.typeIsFor(this.getObjectTypeJavaResourceType(), typeName);
-	}
-
-	protected boolean objectTypeIsIn(IPackageFragment packageFragment) {
-		return this.typeIsIn(this.getObjectTypeJavaResourceType(), packageFragment);
-	}
-
-	protected JavaResourceAbstractType getObjectTypeJavaResourceType() {
-		return this.getMappingFileRoot().resolveJavaResourceType(this.objectType);
-	}
-
-
-	// ********** refactoring **********
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createRenameDataTypeEdits(originalType, newName),
-				this.createRenameObjectTypeEdits(originalType, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameDataTypeEdits(IType originalType, String newName) {
-		return this.dataTypeIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameDataTypeEdit(originalType, newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameDataTypeEdit(IType originalType, String newName) {
-		return this.xmlConverter.createRenameDataTypeEdit(originalType, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameObjectTypeEdits(IType originalType, String newName) {
-		return this.objectTypeIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameObjectTypeEdit(originalType, newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameObjectTypeEdit(IType originalType, String newName) {
-		return this.xmlConverter.createRenameObjectTypeEdit(originalType, newName);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createMoveDataTypeEdits(originalType, newPackage),
-				this.createMoveObjectTypeEdits(originalType, newPackage)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createMoveDataTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.dataTypeIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameDataTypePackageEdit(newPackage.getElementName())) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameDataTypePackageEdit(String newName) {
-		return this.xmlConverter.createRenameDataTypePackageEdit(newName);
-	}
-
-	protected Iterable<ReplaceEdit> createMoveObjectTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.objectTypeIsFor(originalType.getFullyQualifiedName('.')) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameObjectTypePackageEdit(newPackage.getElementName())) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected ReplaceEdit createRenameObjectTypePackageEdit(String newName) {
-		return this.xmlConverter.createRenameObjectTypePackageEdit(newName);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createRenameDataTypePackageEdits(originalPackage, newName),
-				this.createRenameObjectTypePackageEdits(originalPackage, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createRenameDataTypePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.dataTypeIsIn(originalPackage) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameDataTypePackageEdit(newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	protected Iterable<ReplaceEdit> createRenameObjectTypePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.objectTypeIsIn(originalPackage) ?
-				new SingleElementIterable<ReplaceEdit>(this.createRenameObjectTypePackageEdit(newName)) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-
-	// ********** misc **********
-
-	public Class<EclipseLinkTypeConverter> getType() {
-		return EclipseLinkTypeConverter.class;
-	}
-
-	protected boolean typeIsFor(JavaResourceAbstractType type, String typeName) {
-		return (type != null) && type.getQualifiedName().equals(typeName);
-	}
-
-	protected boolean typeIsIn(JavaResourceAbstractType type, IPackageFragment packageFragment) {
-		return (type != null) && type.isIn(packageFragment);
-	}
-
-
-	// ********** adapter **********
-
-	public static class Adapter
-		extends AbstractAdapter
-	{
-		private static final Adapter INSTANCE = new Adapter();
-		public static Adapter instance() {
-			return INSTANCE;
-		}
-
-		private Adapter() {
-			super();
-		}
-
-		public Class<EclipseLinkTypeConverter> getConverterType() {
-			return EclipseLinkTypeConverter.class;
-		}
-
-		public XmlTypeConverter getXmlConverter(XmlConverterHolder xmlConverterContainer) {
-			return xmlConverterContainer.getTypeConverter();
-		}
-
-		public OrmEclipseLinkTypeConverter buildConverter(XmlNamedConverter xmlConverter, XmlContextNode parent) {
-			return new OrmEclipseLinkTypeConverter(parent, (XmlTypeConverter) xmlConverter);
-		}
-
-		@Override
-		protected XmlTypeConverter buildXmlConverter() {
-			return EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverter();
-		}
-
-		@Override
-		public void setXmlConverter(XmlConverterHolder xmlConverterContainer, XmlNamedConverter xmlConverter) {
-			xmlConverterContainer.setTypeConverter((XmlTypeConverter) xmlConverter);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMapping.java
deleted file mode 100644
index 0e7351cfca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMapping.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne;
-
-public class OrmEclipseLinkVariableOneToOneMapping
-	extends AbstractOrmAttributeMapping<XmlVariableOneToOne> 
-	implements EclipseLinkVariableOneToOneMapping
-{
-	public OrmEclipseLinkVariableOneToOneMapping(OrmPersistentAttribute parent, XmlVariableOneToOne xmlMapping) {
-		super(parent, xmlMapping);
-	}
-
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	public int getXmlSequence() {
-		return 65;
-	}
-	
-	public void initializeOn(OrmAttributeMapping newMapping) {
-		newMapping.initializeFromOrmAttributeMapping(this);
-	}
-
-	public void addXmlAttributeMappingTo(org.eclipse.jpt.jpa.core.resource.orm.Attributes xmlAttributes) {
-		((Attributes) xmlAttributes).getVariableOneToOnes().add(this.xmlAttributeMapping);
-	}
-	
-	public void removeXmlAttributeMappingFrom(org.eclipse.jpt.jpa.core.resource.orm.Attributes xmlAttributes) {
-		((Attributes) xmlAttributes).getVariableOneToOnes().remove(this.xmlAttributeMapping);
-	}
-}
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
deleted file mode 100644
index 308eb723ac..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import org.eclipse.emf.ecore.EFactory;
-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;
-
-public class OrmEclipseLinkVariableOneToOneMappingDefinition
-	implements OrmAttributeMappingDefinition
-{
-	// singleton
-	private static final OrmEclipseLinkVariableOneToOneMappingDefinition INSTANCE = 
-			new OrmEclipseLinkVariableOneToOneMappingDefinition();
-	
-	
-	/**
-	 * Return the singleton
-	 */
-	public static OrmAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private OrmEclipseLinkVariableOneToOneMappingDefinition() {
-		super();
-	}
-	
-	
-	public String getKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	public XmlAttributeMapping buildResourceMapping(EFactory factory) {
-		return EmfTools.create(
-				factory, 
-				EclipseLinkOrmPackage.eINSTANCE.getXmlVariableOneToOne(), 
-				XmlVariableOneToOne.class);
-	}
-	
-	public OrmAttributeMapping buildContextMapping(
-			OrmPersistentAttribute parent, 
-			XmlAttributeMapping resourceMapping, 
-			OrmXmlContextNodeFactory factory) {
-		return ((EclipseLinkOrmXmlContextNodeFactory) factory).
-				buildOrmEclipseLinkVariableOneToOneMapping(parent, (XmlVariableOneToOne) resourceMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java
deleted file mode 100644
index 77a0ec3dd6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
-
-import java.util.List;
-
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmConverter;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmVersionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkVersionMapping
-	extends AbstractOrmVersionMapping<XmlVersion>
-	implements EclipseLinkVersionMapping
-{	
-	protected final OrmEclipseLinkMutable mutable;
-	
-	
-	public OrmEclipseLinkVersionMapping(OrmPersistentAttribute parent, XmlVersion xmlMapping) {
-		super(parent, xmlMapping);
-		this.mutable = new OrmEclipseLinkMutable(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.mutable.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.mutable.update();
-	}
-
-
-	// ********** mutable **********
-
-	public EclipseLinkMutable getMutable() {
-		return this.mutable;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * put the EclipseLink convert adapter first - this is the order EclipseLink searches
-	 */
-	@Override
-	protected Iterable<OrmConverter.Adapter> getConverterAdapters() {
-		return new CompositeIterable<OrmConverter.Adapter>(OrmEclipseLinkConvert.Adapter.instance(), super.getConverterAdapters());
-	}
-
-
-	// ********** validation **********
-	
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO mutable validation
-	}
-
-	@Override
-	protected void validateAttributeType(List<IMessage> messages) {
-		if (!ArrayTools.contains(SUPPORTED_TYPE_NAMES, this.getPersistentAttribute().getTypeName())) {
-			messages.add(
-					DefaultEclipseLinkJpaValidationMessages.buildMessage(
-							IMessage.HIGH_SEVERITY,
-							EclipseLinkJpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_VERSION_MAPPING_TYPE,
-							new String[] {this.getName()},
-							this,
-							this.getNameTextRange()
-					)
-			);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkJarFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkJarFileRef.java
deleted file mode 100644
index e1cc5b2cdd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkJarFileRef.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractJarFileRef;
-import org.eclipse.jpt.jpa.core.resource.persistence.XmlJarFileRef;
-
-public class EclipseLinkJarFileRef 
-	extends AbstractJarFileRef
-{
-	public EclipseLinkJarFileRef(PersistenceUnit parent, XmlJarFileRef xmlJarFileRef) {
-		super(parent, xmlJarFileRef);
-	}
-
-	@Override
-	protected IPath[] buildRuntimeJarFilePathWeb(IPath root, IPath jarFilePath) {
-		IPath[] genericPath = super.buildRuntimeJarFilePathWeb(root, jarFilePath);
-		return ArrayTools.removeLast(genericPath);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java
deleted file mode 100644
index 1888f71619..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence;
-
-import java.util.Set;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties;
-
-/**
- * EclipseLinkPersistenceUnitProperties
- * 
- * Listens to the propertyListAdapter
- */
-public abstract class EclipseLinkPersistenceUnitProperties extends AbstractPersistenceUnitProperties
-{
-	// ********** constructors **********
-	protected EclipseLinkPersistenceUnitProperties(PersistenceUnit parent) {
-		super(parent);
-	}
-
-	// ******** Convenience methods ********
-	
-	protected Set<PersistenceUnit.Property> getPropertiesSetWithPrefix(String keyPrefix) {
-		return CollectionTools.set(this.getPersistenceUnit().getPropertiesWithNamePrefix(keyPrefix));
-	}
-
-	/**
-	 * Extracts the entityName of the specified property name. If the property name
-	 * has no suffix, return an empty string.
-	 */
-	protected String extractEntityNameOf(PersistenceUnit.Property property) {
-		return extractEntityNameOf(property.getName());
-	}
-
-	/**
-	 * Extracts the entityName of the specified string. If the string
-	 * has no suffix, return an empty string.
-	 */
-	protected String extractEntityNameOf(String propertyName) {
-		int index = propertyName.lastIndexOf('.');
-		if (index == -1) {
-			return ""; //$NON-NLS-1$
-		}
-		return propertyName.substring(index + 1);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
deleted file mode 100644
index 9f0a21deb3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlContextNodeFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence;
-
-import org.eclipse.jpt.jpa.core.context.persistence.JarFileRef;
-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.PersistenceUnitProperties;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.resource.persistence.XmlJarFileRef;
-import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.logging.EclipseLinkLogging;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
-
-
-public class EclipseLinkPersistenceXmlContextNodeFactory
-	extends AbstractPersistenceXmlContextNodeFactory
-		implements org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceXmlContextNodeFactory
-{
-	
-	@Override
-	public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
-		return new EclipseLinkPersistenceUnit(parent, xmlPersistenceUnit);
-	}
-	
-	@Override
-	public JarFileRef buildJarFileRef(PersistenceUnit parent, XmlJarFileRef xmlJarFileRef) {
-		return new EclipseLinkJarFileRef(parent, xmlJarFileRef);
-	}
-
-	public PersistenceUnitProperties buildConnection(PersistenceUnit parent) {
-		return new EclipseLinkConnection(parent);
-	}
-	
-	public PersistenceUnitProperties buildOptions(PersistenceUnit parent) {
-		return new EclipseLinkOptions(parent);
-	}
-	
-	public PersistenceUnitProperties buildLogging(PersistenceUnit parent) {
-		return new EclipseLinkLogging(parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlDefinition.java
deleted file mode 100644
index e522115f3a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceXmlDefinition.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceXmlDefinition;
-import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
-
-public class EclipseLinkPersistenceXmlDefinition
-	extends AbstractPersistenceXmlDefinition
-{
-	// singleton
-	private static final PersistenceXmlDefinition INSTANCE = new EclipseLinkPersistenceXmlDefinition();
-
-	/**
-	 * Return the singleton
-	 */
-	public static PersistenceXmlDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkPersistenceXmlDefinition() {
-		super();
-	}
-
-	public JptResourceType getResourceType() {
-		return JptJpaCorePlugin.PERSISTENCE_XML_1_0_RESOURCE_TYPE;
-	}
-
-	public EFactory getResourceNodeFactory() {
-		return PersistenceFactory.eINSTANCE;
-	}
-
-	@Override
-	protected PersistenceXmlContextNodeFactory buildContextNodeFactory() {
-		return new EclipseLinkPersistenceXmlContextNodeFactory();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java
deleted file mode 100644
index 98c215de96..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/caching/EclipseLinkCaching.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.caching;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching.CacheType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching.Caching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching.Entity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.caching.FlushClearCache;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-
-/**
- * EclipseLinkCaching encapsulates EclipseLink Caching properties.
- */
-public class EclipseLinkCaching extends EclipseLinkPersistenceUnitProperties
-	implements Caching
-{
-	// ********** EclipseLink properties **********
-	private CacheType cacheTypeDefault;
-	private Integer cacheSizeDefault;
-	private Boolean sharedCacheDefault;
-	private FlushClearCache flushClearCache;
-
-	private List<Entity> entities;
-	
-	// ********** constructors **********
-	public EclipseLinkCaching(PersistenceUnit parent) {
-		super(parent);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		this.entities = new ArrayList<Entity>();
-		this.cacheTypeDefault = 
-			this.getEnumValue(ECLIPSELINK_CACHE_TYPE_DEFAULT, CacheType.values());
-		this.cacheSizeDefault = 
-			this.getIntegerValue(ECLIPSELINK_CACHE_SIZE_DEFAULT);
-		this.sharedCacheDefault = 
-			this.getBooleanValue(ECLIPSELINK_CACHE_SHARED_DEFAULT);
-		this.flushClearCache = 
-			this.getEnumValue(ECLIPSELINK_FLUSH_CLEAR_CACHE, FlushClearCache.values());
-		
-		Set<PersistenceUnit.Property> cacheTypeProperties = 
-			this.getPropertiesSetWithPrefix(ECLIPSELINK_CACHE_TYPE);
-		Set<PersistenceUnit.Property> cacheSizeProperties = 
-			this.getPropertiesSetWithPrefix(ECLIPSELINK_CACHE_SIZE);
-		Set<PersistenceUnit.Property> sharedCacheProperties = 
-			this.getPropertiesSetWithPrefix(ECLIPSELINK_SHARED_CACHE);
-		
-		this.initializeEntitiesCacheType(cacheTypeProperties);
-		this.initializeEntitiesCacheSize(cacheSizeProperties);
-		this.initializeEntitiesSharedCache(sharedCacheProperties);
-	}
-
-	private void initializeEntitiesCacheType(Set<PersistenceUnit.Property> cacheTypeProperties) {
-		for (PersistenceUnit.Property cacheTypeProperty : cacheTypeProperties) {
-			this.setEntityCacheTypeOf(cacheTypeProperty);
-		}
-	}
-
-	private void initializeEntitiesCacheSize(Set<PersistenceUnit.Property> cacheSizeProperties) {
-		for (PersistenceUnit.Property cacheSizeProperty : cacheSizeProperties) {
-			this.setEntityCacheSizeOf(cacheSizeProperty);
-		}
-	}
-
-	private void initializeEntitiesSharedCache(Set<PersistenceUnit.Property> sharedCacheProperties) {
-		for (PersistenceUnit.Property sharedCacheProperty : sharedCacheProperties) {
-			this.setEntitySharedCacheOf(sharedCacheProperty);
-		}
-	}
-
-	// ********** behavior **********
-	
-	public void propertyValueChanged(String propertyName, String newValue) {
-		if (propertyName.equals(ECLIPSELINK_CACHE_TYPE_DEFAULT)) {
-			this.cacheTypeDefaultChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_SIZE_DEFAULT)) {
-			this.cacheSizeDefaultChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_SHARED_DEFAULT)) {
-			this.sharedCacheDefaultChanged(newValue);
-		}
-		else if (propertyName.startsWith(ECLIPSELINK_CACHE_TYPE)) {
-			this.cacheTypeChanged(propertyName, newValue);
-		}
-		else if (propertyName.startsWith(ECLIPSELINK_CACHE_SIZE)) {
-			this.cacheSizeChanged(propertyName, newValue);
-		}
-		else if (propertyName.startsWith(ECLIPSELINK_SHARED_CACHE)) {
-			this.sharedCacheChanged(propertyName, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_FLUSH_CLEAR_CACHE)) {
-			this.flushClearCacheChanged(newValue);
-		}
-	}
-	
-	public void propertyRemoved(String propertyName) {
-		if (propertyName.equals(ECLIPSELINK_CACHE_TYPE_DEFAULT)) {
-			this.cacheTypeDefaultChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_SIZE_DEFAULT)) {
-			this.cacheSizeDefaultChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_SHARED_DEFAULT)) {
-			this.sharedCacheDefaultChanged(null);
-		}
-		else if (propertyName.startsWith(ECLIPSELINK_CACHE_TYPE)) {
-			this.cacheTypeChanged(propertyName, null);
-		}
-		else if (propertyName.startsWith(ECLIPSELINK_CACHE_SIZE)) {
-			this.cacheSizeChanged(propertyName, null);
-		}
-		else if (propertyName.startsWith(ECLIPSELINK_SHARED_CACHE)) {
-			this.sharedCacheChanged(propertyName, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_FLUSH_CLEAR_CACHE)) {
-			this.flushClearCacheChanged(null);
-		}
-	}
-	
-	/**
-	 * Adds property names key/value pairs, where: 
-	 * 		key = EclipseLink property key;
-	 * 		value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		propertyNames.put(
-			ECLIPSELINK_CACHE_TYPE_DEFAULT,
-			CACHE_TYPE_DEFAULT_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_CACHE_SIZE_DEFAULT,
-			CACHE_SIZE_DEFAULT_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_CACHE_SHARED_DEFAULT,
-			SHARED_CACHE_DEFAULT_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_FLUSH_CLEAR_CACHE,
-			FLUSH_CLEAR_CACHE_PROPERTY);
-		
-		// Don't need to initialize propertyNames for: 
-		// cacheType, sharedCache, cacheSize
-	}
-
-	/**
-	 * Method used for identifying the given property.
-	 */
-	@Override
-	public boolean itemIsProperty(PersistenceUnit.Property item) {
-		boolean isProperty = super.itemIsProperty(item);
-		
-		if ( ! isProperty && item.getName() != null) {
-				if (item.getName().startsWith(ECLIPSELINK_CACHE_TYPE) || 
-						item.getName().startsWith(ECLIPSELINK_CACHE_SIZE) || 
-						item.getName().startsWith(ECLIPSELINK_SHARED_CACHE)) {
-					return true;
-				}
-		}
-		return isProperty;
-	}
-
-	/**
-	 * Returns the property name used for change notification of the given
-	 * property.
-	 */
-	@Override
-	public String propertyIdOf(PersistenceUnit.Property property) {
-		try {
-			return super.propertyIdOf(property);
-		}
-		catch (IllegalArgumentException e) {
-			if (property.getName().startsWith(ECLIPSELINK_CACHE_TYPE)) {
-				return CACHE_TYPE_PROPERTY;
-			}
-			else if (property.getName().startsWith(ECLIPSELINK_CACHE_SIZE)) {
-				return CACHE_SIZE_PROPERTY;
-			}
-			else if (property.getName().startsWith(ECLIPSELINK_SHARED_CACHE)) {
-				return SHARED_CACHE_PROPERTY;
-			}
-		}
-		throw new IllegalArgumentException("Illegal property: " + property.toString()); //$NON-NLS-1$
-	}
-	
-	public Entity addEntity(String entityName) {
-		if (this.entityExists(entityName)) {
-			throw new IllegalStateException("Duplicate entity: " + entityName); //$NON-NLS-1$
-		}
-		Entity newEntity = this.buildEntity(entityName);
-		this.addItemToList(newEntity, this.entities, ENTITIES_LIST);
-		return newEntity;
-	}
-
-	public void removeEntity(String entityName) {
-		if ( ! this.entityExists(entityName)) {
-			return;
-		}
-		Entity entity = this.getEntityNamed(entityName);
-		this.clearEntity(entity);
-		this.removeEntity(entity);
-	}
-
-	// ********** CacheType **********
-	public CacheType getCacheTypeOf(String entityName) {
-		Entity entity = this.getEntityNamed(entityName);
-		return (entity == null) ? null : entity.getCacheType();
-	}
-
-	public void setCacheTypeOf(String entityName, CacheType newCacheType) {
-		Entity old = this.setEntityCacheTypeOf(entityName, newCacheType);
-		this.putEnumValue(ECLIPSELINK_CACHE_TYPE, entityName, newCacheType, false);
-		this.firePropertyChanged(CACHE_TYPE_PROPERTY, old, this.getEntityNamed(entityName));
-	}
-
-	private void cacheTypeChanged(String propertyName, String stringValue) {
-		String entityName = this.extractEntityNameOf(propertyName);
-		if( ! StringTools.stringIsEmpty(entityName)) {
-			Entity old = this.setEntityCacheTypeOf(entityName, stringValue); 
-			this.firePropertyChanged(CACHE_TYPE_PROPERTY, old, this.getEntityNamed(entityName));
-		}
-	}
-	
-	public CacheType getDefaultCacheType() {
-		return (this.cacheTypeDefault == null) ? DEFAULT_CACHE_TYPE : this.cacheTypeDefault;
-	}
-
-	// ********** CacheSize **********
-	public Integer getCacheSizeOf(String entityName) {
-		Entity entity = this.getEntityNamed(entityName);
-		return (entity == null) ? null : entity.getCacheSize();
-	}
-
-	public void setCacheSizeOf(String entityName, Integer newCacheSize) {
-		Entity old = this.setEntityCacheSizeOf(entityName, newCacheSize);
-		this.putIntegerValue(ECLIPSELINK_CACHE_SIZE + entityName, newCacheSize);
-		this.firePropertyChanged(CACHE_SIZE_PROPERTY, old, this.getEntityNamed(entityName));
-	}
-
-	private void cacheSizeChanged(String propertyName, String stringValue) {
-		String entityName = this.extractEntityNameOf(propertyName);
-		if( ! StringTools.stringIsEmpty(entityName)) {
-			Entity old = this.setEntityCacheSizeOf(entityName, stringValue);
-			this.firePropertyChanged(CACHE_SIZE_PROPERTY, old, this.getEntityNamed(entityName));
-		}
-	}
-
-	public Integer getDefaultCacheSize() {
-		return (this.cacheSizeDefault == null) ? DEFAULT_CACHE_SIZE : this.cacheSizeDefault;
-	}
-
-	// ********** SharedCache **********
-	public Boolean getSharedCacheOf(String entityName) {
-		Entity entity = this.getEntityNamed(entityName);
-		return (entity == null) ? null : entity.cacheIsShared();
-	}
-
-	public void setSharedCacheOf(String entityName, Boolean newSharedCache) {
-		Entity old = this.setEntitySharedCacheOf(entityName, newSharedCache);
-		this.putBooleanValue(ECLIPSELINK_SHARED_CACHE, entityName, newSharedCache, false);
-		this.firePropertyChanged(SHARED_CACHE_PROPERTY, old, this.getEntityNamed(entityName));
-	}
-
-	private void sharedCacheChanged(String propertyName, String stringValue) {
-		String entityName = this.extractEntityNameOf(propertyName);
-		if( ! StringTools.stringIsEmpty(entityName)) {
-			Entity old = this.setEntitySharedCacheOf(entityName, stringValue);
-			this.firePropertyChanged(SHARED_CACHE_PROPERTY, old, this.getEntityNamed(entityName));
-		}
-	}
-
-	public Boolean getDefaultSharedCache() {
-		return (this.sharedCacheDefault == null) ? DEFAULT_SHARED_CACHE : this.sharedCacheDefault;
-	}
-
-	// ********** CacheTypeDefault **********
-	public CacheType getCacheTypeDefault() {
-		return this.cacheTypeDefault;
-	}
-
-	public void setCacheTypeDefault(CacheType newCacheTypeDefault) {
-		CacheType old = this.cacheTypeDefault;
-		this.cacheTypeDefault = newCacheTypeDefault;
-		this.putProperty(CACHE_TYPE_DEFAULT_PROPERTY, newCacheTypeDefault);
-		this.firePropertyChanged(CACHE_TYPE_DEFAULT_PROPERTY, old, newCacheTypeDefault);
-	}
-
-	private void cacheTypeDefaultChanged(String stringValue) {
-		CacheType newValue = getEnumValueOf(stringValue, CacheType.values());
-		CacheType old = this.cacheTypeDefault;
-		this.cacheTypeDefault = newValue;
-		this.firePropertyChanged(CACHE_TYPE_DEFAULT_PROPERTY, old, newValue);
-	}
-
-	public CacheType getDefaultCacheTypeDefault() {
-		return DEFAULT_CACHE_TYPE_DEFAULT;
-	}
-
-	// ********** CacheSizeDefault **********
-	public Integer getCacheSizeDefault() {
-		return this.cacheSizeDefault;
-	}
-
-	public void setCacheSizeDefault(Integer newCacheSizeDefault) {
-		Integer old = this.cacheSizeDefault;
-		this.cacheSizeDefault = newCacheSizeDefault;
-		this.putProperty(CACHE_SIZE_DEFAULT_PROPERTY, newCacheSizeDefault);
-		this.firePropertyChanged(CACHE_SIZE_DEFAULT_PROPERTY, old, newCacheSizeDefault);
-	}
-
-	private void cacheSizeDefaultChanged(String stringValue) {
-		Integer newValue = getIntegerValueOf(stringValue);
-		Integer old = this.cacheSizeDefault;
-		this.cacheSizeDefault = newValue;
-		this.firePropertyChanged(CACHE_SIZE_DEFAULT_PROPERTY, old, newValue);
-	}
-
-	public Integer getDefaultCacheSizeDefault() {
-		return DEFAULT_CACHE_SIZE_DEFAULT;
-	}
-
-	// ********** SharedCacheDefault **********
-	public Boolean getSharedCacheDefault() {
-		return this.sharedCacheDefault;
-	}
-
-	public void setSharedCacheDefault(Boolean newSharedCacheDefault) {
-		Boolean old = this.sharedCacheDefault;
-		this.sharedCacheDefault = newSharedCacheDefault;
-		this.putProperty(SHARED_CACHE_DEFAULT_PROPERTY, newSharedCacheDefault);
-		this.firePropertyChanged(SHARED_CACHE_DEFAULT_PROPERTY, old, newSharedCacheDefault);
-	}
-
-	private void sharedCacheDefaultChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.sharedCacheDefault;
-		this.sharedCacheDefault = newValue;
-		this.firePropertyChanged(SHARED_CACHE_DEFAULT_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultSharedCacheDefault() {
-		return DEFAULT_SHARED_CACHE_DEFAULT;
-	}
-
-	// ********** FlushClearCache **********
-	
-	public FlushClearCache getFlushClearCache() {
-		return this.flushClearCache;
-	}
-	
-	public void setFlushClearCache(FlushClearCache newFlushClearCache) {
-		FlushClearCache old = this.flushClearCache;
-		this.flushClearCache = newFlushClearCache;
-		this.putProperty(FLUSH_CLEAR_CACHE_PROPERTY, newFlushClearCache);
-		this.firePropertyChanged(FLUSH_CLEAR_CACHE_PROPERTY, old, newFlushClearCache);
-	}
-
-	private void flushClearCacheChanged(String stringValue) {
-		FlushClearCache newValue = getEnumValueOf(stringValue, FlushClearCache.values());
-		FlushClearCache old = this.flushClearCache;
-		this.flushClearCache = newValue;
-		this.firePropertyChanged(FLUSH_CLEAR_CACHE_PROPERTY, old, newValue);
-	}
-	
-	public FlushClearCache getDefaultFlushClearCache() {
-		return DEFAULT_FLUSH_CLEAR_CACHE;
-	}
-
-	// ****** Entity CacheType *******
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntityCacheTypeOf(String entityName, String stringValue) {
-		 if(( ! this.entityExists(entityName)) && StringTools.stringIsEmpty(stringValue)) {
-				//this is a property that is currently being added, we don't need to deal with it until the value is set
-				 return null;
-			 }
-		CacheType newValue = getEnumValueOf(stringValue, CacheType.values());
-		return this.setEntityCacheTypeOf(entityName, newValue);
-	}
-
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntityCacheTypeOf(String entityName, CacheType cacheType) {
-		Entity entity = (this.entityExists(entityName)) ?
-						this.getEntityNamed(entityName) :
-						this.addEntity(entityName);
-		return this.setEntityCacheTypeOf(entity, cacheType);
-	}
-
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntityCacheTypeOf(Entity entity, CacheType cacheType) {
-		if(entity == null) {
-			throw new IllegalArgumentException();
-		}
-		Entity old = entity.clone();
-		entity.setCacheType(cacheType);
-		return old;
-	}
-
-	private void setEntityCacheTypeOf(PersistenceUnit.Property cacheTypeProperty) {
-		String entityName = this.extractEntityNameOf(cacheTypeProperty);
-		this.setEntityCacheTypeOf(entityName, cacheTypeProperty.getValue());
-	}
-
-	// ****** Entity Cache size *******
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntityCacheSizeOf(String entityName, String stringValue) {
-		 if(( ! this.entityExists(entityName)) && StringTools.stringIsEmpty(stringValue)) {
-				//this is a property that is currently being added, we don't need to deal with it until the value is set
-				 return null;
-			 }
-		Integer newValue = getIntegerValueOf(stringValue);
-		return this.setEntityCacheSizeOf(entityName, newValue);
-	}
-
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntityCacheSizeOf(String entityName, Integer size) {
-		Entity entity = (this.entityExists(entityName)) ?
-						this.getEntityNamed(entityName) :
-						this.addEntity(entityName);
-		return this.setEntityCacheSizeOf(entity, size);
-	}
-
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntityCacheSizeOf(Entity entity, Integer size) {
-		if(entity == null) {
-			throw new IllegalArgumentException();
-		}
-		Entity old = entity.clone();
-		entity.setCacheSize(size);
-		return old;
-	}
-
-	private void setEntityCacheSizeOf(PersistenceUnit.Property cacheSizeProperty) {
-		String entityName = this.extractEntityNameOf(cacheSizeProperty);
-		this.setEntityCacheSizeOf(entityName, cacheSizeProperty.getValue());
-	}
-
-	// ****** Entity SharedCache *******
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntitySharedCacheOf(String entityName, String stringValue) {
-		 if(( ! this.entityExists(entityName)) && StringTools.stringIsEmpty(stringValue)) {
-				//this is a property that is currently being added, we don't need to deal with it until the value is set
-				 return null;
-			 }
-		Boolean newValue = getBooleanValueOf(stringValue);
-		return this.setEntitySharedCacheOf(entityName, newValue);
-	}
-
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntitySharedCacheOf(String entityName, Boolean sharedCache) {
-		Entity entity = (this.entityExists(entityName)) ?
-						this.getEntityNamed(entityName) :
-						this.addEntity(entityName);
-		return this.setEntitySharedCacheOf(entity, sharedCache);
-	}
-
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntitySharedCacheOf(Entity entity, Boolean sharedCache) {
-		if(entity == null) {
-			throw new IllegalArgumentException();
-		}
-		Entity old = entity.clone();
-		entity.setSharedCache(sharedCache);
-		return old;
-	}
-
-	private void setEntitySharedCacheOf(PersistenceUnit.Property sharedCacheProperty) {
-		String entityName = this.extractEntityNameOf(sharedCacheProperty);
-		this.setEntitySharedCacheOf(entityName, sharedCacheProperty.getValue());
-	}
-
-	// ****** convenience methods *******
-
-	/**
-	 * Set all Entity properties to default.
-	 */
-	private void clearEntity(Entity entity) {
-		if(entity.isEmpty()) {
-			return;
-		}
-		String entityName = entity.getName();
-		this.setCacheTypeOf(entityName, null);
-		this.setCacheSizeOf(entityName, null);
-		this.setSharedCacheOf(entityName, null);
-	}
-
-	/**
-	 * Returns the Entity with the given name.
-	 */
-	private Entity getEntityNamed(String name) {
-		for(Entity entity: this.entities) {
-			if(entity.getName().equals(name)) {
-				return entity;
-			}
-		}
-		return null;
-	}
-
-	private Entity buildEntity(String name) {
-		return new Entity(this, name);
-	}
-
-	private void removeEntity(Entity entity) {
-		if(entity == null) {
-			throw new NullPointerException();
-		}
-		this.removeItemFromList(entity, this.entities, ENTITIES_LIST);
-	}
-
-	/**
-	 * Return whether the Entity exist.
-	 */
-	public boolean entityExists(String name) {
-		for(Entity entity: this.entities) {
-			if(entity.getName().equals(name)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Removes cacheTypeDefault, cacheSizeDefault, flushClearCache properties.
-	 */
-	public void removeDefaultCachingProperties() {
-		this.setCacheTypeDefault(null);
-		this.setCacheSizeDefault(null);
-		this.setFlushClearCache(null);
-	}
-
-	// ****** entities list *******
-
-	public ListIterable<Entity> getEntities() {
-		return new LiveCloneListIterable<Entity>(this.entities);
-	}
-
-	public Iterable<String> getEntityNames() {
-		return new TransformationIterable<Entity, String>(this.getEntities()) {
-			@Override
-			protected String transform(Entity entity) {
-				return entity.getName();
-			}
-		};
-	}
-
-	public int getEntitiesSize() {
-		return this.entities.size();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/connection/EclipseLinkConnection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/connection/EclipseLinkConnection.java
deleted file mode 100644
index 1e12e58f60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/connection/EclipseLinkConnection.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.connection;
-
-import java.util.Map;
-
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection.BatchWriting;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection.Connection;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection.ExclusiveConnectionMode;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-
-/**
- *  EclipseLinkConnection
- */
-public class EclipseLinkConnection extends EclipseLinkPersistenceUnitProperties
-	implements Connection
-{
-	
-	// ********** EclipseLink properties **********
-	private BatchWriting batchWriting;
-	private Boolean nativeSql;
-	private Boolean cacheStatements;
-	private Integer cacheStatementsSize;
-	protected String driver;
-	protected String url;
-	protected String user;
-	protected String password;
-	private Boolean bindParameters;
-	private Boolean readConnectionsShared;
-	private Integer readConnectionsMin;
-	private Integer readConnectionsMax;
-	private Integer writeConnectionsMin;
-	private Integer writeConnectionsMax;
-	private ExclusiveConnectionMode exclusiveConnectionMode;
-	private Boolean lazyConnection;
-	
-
-	// ********** constructors **********
-	public EclipseLinkConnection(PersistenceUnit parent) {
-		super(parent);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		this.initializeDatabaseConnectionProperties();
-		
-		this.batchWriting = 
-			this.getEnumValue(ECLIPSELINK_BATCH_WRITING, BatchWriting.values());
-		this.nativeSql = 
-			this.getBooleanValue(ECLIPSELINK_NATIVE_SQL);
-		this.cacheStatements = 
-			this.getBooleanValue(ECLIPSELINK_CACHE_STATEMENTS);
-		this.cacheStatementsSize = 
-			this.getIntegerValue(ECLIPSELINK_CACHE_STATEMENTS_SIZE);
-		this.bindParameters = 
-			this.getBooleanValue(ECLIPSELINK_BIND_PARAMETERS);
-		this.readConnectionsShared = 
-			this.getBooleanValue(ECLIPSELINK_READ_CONNECTIONS_SHARED);
-		this.readConnectionsMin = 
-			this.getIntegerValue(ECLIPSELINK_READ_CONNECTIONS_MIN);
-		this.readConnectionsMax = 
-			this.getIntegerValue(ECLIPSELINK_READ_CONNECTIONS_MAX);
-		this.writeConnectionsMin = 
-			this.getIntegerValue(ECLIPSELINK_WRITE_CONNECTIONS_MIN);
-		this.writeConnectionsMax = 
-			this.getIntegerValue(ECLIPSELINK_WRITE_CONNECTIONS_MAX);
-		this.exclusiveConnectionMode = 
-			this.getEnumValue(ECLIPSELINK_EXCLUSIVE_CONNECTION_MODE, ExclusiveConnectionMode.values());
-		this.lazyConnection = 
-			this.getBooleanValue(ECLIPSELINK_LAZY_CONNECTION);
-	}
-	
-	protected void initializeDatabaseConnectionProperties() {
-		this.driver = 
-			this.getStringValue(ECLIPSELINK_DRIVER);
-		this.url = 
-			this.getStringValue(ECLIPSELINK_URL);
-		this.user = 
-			this.getStringValue(ECLIPSELINK_USER);
-		this.password = 
-			this.getStringValue(ECLIPSELINK_PASSWORD);
-	}
-
-	// ********** behavior **********
-	
-	public void propertyValueChanged(String propertyName, String newValue) {
-		if (propertyName.equals(ECLIPSELINK_NATIVE_SQL)) {
-			this.nativeSqlChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_BATCH_WRITING)) {
-			this.batchWritingChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_STATEMENTS)) {
-			this.cacheStatementsChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_DRIVER)) {
-			this.driverChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_URL)) {
-			this.urlChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_USER)) {
-			this.userChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_PASSWORD)) {
-			this.passwordChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_BIND_PARAMETERS)) {
-			this.bindParametersChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_READ_CONNECTIONS_SHARED)) {
-			this.readConnectionsSharedChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_STATEMENTS_SIZE)) {
-			this.cacheStatementsSizeChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_READ_CONNECTIONS_MIN)) {
-			readConnectionsMinChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_READ_CONNECTIONS_MAX)) {
-			readConnectionsMaxChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WRITE_CONNECTIONS_MIN)) {
-			writeConnectionsMinChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WRITE_CONNECTIONS_MAX)) {
-			writeConnectionsMaxChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EXCLUSIVE_CONNECTION_MODE)) {
-			this.exclusiveConnectionModeChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_LAZY_CONNECTION)) {
-			this.lazyConnectionChanged(newValue);
-		}
-	}
-	
-	public void propertyRemoved(String propertyName) {
-		if (propertyName.equals(ECLIPSELINK_NATIVE_SQL)) {
-			this.nativeSqlChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_BATCH_WRITING)) {
-			this.batchWritingChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_STATEMENTS)) {
-			this.cacheStatementsChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_DRIVER)) {
-			this.driverChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_URL)) {
-			this.urlChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_USER)) {
-			this.userChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_PASSWORD)) {
-			this.passwordChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_BIND_PARAMETERS)) {
-			this.bindParametersChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_READ_CONNECTIONS_SHARED)) {
-			this.readConnectionsSharedChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_STATEMENTS_SIZE)) {
-			this.cacheStatementsSizeChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_READ_CONNECTIONS_MIN)) {
-			readConnectionsMinChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_READ_CONNECTIONS_MAX)) {
-			readConnectionsMaxChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WRITE_CONNECTIONS_MIN)) {
-			writeConnectionsMinChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WRITE_CONNECTIONS_MAX)) {
-			writeConnectionsMaxChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EXCLUSIVE_CONNECTION_MODE)) {
-			this.exclusiveConnectionModeChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_LAZY_CONNECTION)) {
-			this.lazyConnectionChanged(null);
-		}
-	}
-
-	/**
-	 * Adds property names key/value pairs, where: 
-	 * 		key = EclipseLink property key
-	 * 		value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		this.addDatabaseConnectionPropertyNames(propertyNames);
-		
-		propertyNames.put(
-			ECLIPSELINK_NATIVE_SQL,
-			NATIVE_SQL_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_BATCH_WRITING,
-			BATCH_WRITING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_CACHE_STATEMENTS,
-			CACHE_STATEMENTS_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_CACHE_STATEMENTS_SIZE,
-			CACHE_STATEMENTS_SIZE_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_BIND_PARAMETERS,
-			BIND_PARAMETERS_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_READ_CONNECTIONS_SHARED,
-			READ_CONNECTIONS_SHARED_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_READ_CONNECTIONS_MIN,
-			READ_CONNECTIONS_MIN_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_READ_CONNECTIONS_MAX,
-			READ_CONNECTIONS_MAX_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WRITE_CONNECTIONS_MIN,
-			WRITE_CONNECTIONS_MIN_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WRITE_CONNECTIONS_MAX,
-			WRITE_CONNECTIONS_MAX_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_EXCLUSIVE_CONNECTION_MODE,
-			EXCLUSIVE_CONNECTION_MODE_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_LAZY_CONNECTION,
-			LAZY_CONNECTION_PROPERTY);
-	}
-
-	protected void addDatabaseConnectionPropertyNames(Map<String, String> propertyNames) {
-		propertyNames.put(
-			ECLIPSELINK_DRIVER,
-			DRIVER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_URL,
-			URL_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_USER,
-			USER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_PASSWORD,
-			PASSWORD_PROPERTY);
-	}
-
-	/**
-     * Does all pre-treatment in this method before the property is set
-	 */
-	protected void preSetProperty() {
-		// do nothing by default
-	}
-
-	// ********** NativeSql **********
-	public Boolean getNativeSql() {
-		return this.nativeSql;
-	}
-
-	public void setNativeSql(Boolean newNativeSql) {
-		this.preSetProperty();
-		
-		Boolean old = this.nativeSql;
-		this.nativeSql = newNativeSql;
-		this.putProperty(NATIVE_SQL_PROPERTY, newNativeSql);
-		this.firePropertyChanged(NATIVE_SQL_PROPERTY, old, newNativeSql);
-	}
-	
-	private void nativeSqlChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.nativeSql;
-		this.nativeSql = newValue;
-		this.firePropertyChanged(NATIVE_SQL_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultNativeSql() {
-		return DEFAULT_NATIVE_SQL;
-	}
-
-	// ********** BatchWriting **********
-	
-	public BatchWriting getBatchWriting() {
-		return this.batchWriting;
-	}
-	
-	public void setBatchWriting(BatchWriting newBatchWriting) {
-		this.preSetProperty();
-		
-		BatchWriting old = this.batchWriting;
-		this.batchWriting = newBatchWriting;
-		this.putProperty(BATCH_WRITING_PROPERTY, newBatchWriting);
-		this.firePropertyChanged(BATCH_WRITING_PROPERTY, old, newBatchWriting);
-	}
-
-	private void batchWritingChanged(String stringValue) {
-		BatchWriting newValue = getEnumValueOf(stringValue, BatchWriting.values());
-		BatchWriting old = this.batchWriting;
-		this.batchWriting = newValue;
-		this.firePropertyChanged(BATCH_WRITING_PROPERTY, old, newValue);
-	}
-	
-	public BatchWriting getDefaultBatchWriting() {
-		return DEFAULT_BATCH_WRITING;
-	}
-
-	// ********** CacheStatements **********
-	public Boolean getCacheStatements() {
-		return this.cacheStatements;
-	}
-
-	public void setCacheStatements(Boolean newCacheStatements) {
-		this.preSetProperty();
-		
-		Boolean old = this.cacheStatements;
-		this.cacheStatements = newCacheStatements;
-		this.putProperty(CACHE_STATEMENTS_PROPERTY, newCacheStatements);
-		this.firePropertyChanged(CACHE_STATEMENTS_PROPERTY, old, newCacheStatements);
-	}
-
-	private void cacheStatementsChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.cacheStatements;
-		this.cacheStatements = newValue;
-		this.firePropertyChanged(CACHE_STATEMENTS_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultCacheStatements() {
-		return DEFAULT_CACHE_STATEMENTS;
-	}
-
-	// ********** CacheStatementsSize **********
-	public Integer getCacheStatementsSize() {
-		return this.cacheStatementsSize;
-	}
-
-	public void setCacheStatementsSize(Integer newCacheStatementsSize) {
-		this.preSetProperty();
-		
-		Integer old = this.cacheStatementsSize;
-		this.cacheStatementsSize = newCacheStatementsSize;
-		this.putProperty(CACHE_STATEMENTS_SIZE_PROPERTY, newCacheStatementsSize);
-		this.firePropertyChanged(CACHE_STATEMENTS_SIZE_PROPERTY, old, newCacheStatementsSize);
-	}
-
-	private void cacheStatementsSizeChanged(String stringValue) {
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.cacheStatementsSize;
-		this.cacheStatementsSize = newValue;
-		this.firePropertyChanged(CACHE_STATEMENTS_SIZE_PROPERTY, old, newValue);
-	}
-
-	public Integer getDefaultCacheStatementsSize() {
-		return DEFAULT_CACHE_STATEMENTS_SIZE;
-	}
-
-	// ********** Driver **********
-	public String getDriver() {
-		return this.driver;
-	}
-
-	public void setDriver(String newDriver) {
-		this.preSetProperty();
-		
-		String old = this.driver;
-		this.driver = newDriver;
-		this.putProperty(DRIVER_PROPERTY, newDriver);
-		this.firePropertyChanged(DRIVER_PROPERTY, old, newDriver);
-	}
-
-	protected void driverChanged(String newValue) {
-		String old = this.driver;
-		this.driver = newValue;
-		this.firePropertyChanged(DRIVER_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultDriver() {
-		return DEFAULT_DRIVER;
-	}
-
-	// ********** URL **********
-	public String getUrl() {
-		return this.url;
-	}
-
-	public void setUrl(String newUrl) {
-		this.preSetProperty();
-		
-		String old = this.url;
-		this.url = newUrl;
-		this.putProperty(URL_PROPERTY, newUrl);
-		this.firePropertyChanged(URL_PROPERTY, old, newUrl);
-	}
-
-	protected void urlChanged(String newValue) {
-		String old = this.url;
-		this.url = newValue;
-		this.firePropertyChanged(URL_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultUrl() {
-		return DEFAULT_URL;
-	}
-
-	// ********** User **********
-	public String getUser() {
-		return this.user;
-	}
-
-	public void setUser(String newUser) {
-		this.preSetProperty();
-		
-		String old = this.user;
-		this.user = newUser;
-		this.putProperty(USER_PROPERTY, newUser);
-		this.firePropertyChanged(USER_PROPERTY, old, newUser);
-	}
-
-	protected void userChanged(String newValue) {
-		String old = this.user;
-		this.user = newValue;
-		this.firePropertyChanged(USER_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultUser() {
-		return DEFAULT_USER;
-	}
-
-	// ********** Password **********
-	public String getPassword() {
-		return this.password;
-	}
-
-	public void setPassword(String newPassword) {
-		this.preSetProperty();
-		
-		String old = this.password;
-		this.password = newPassword;
-		this.putProperty(PASSWORD_PROPERTY, newPassword);
-		this.firePropertyChanged(PASSWORD_PROPERTY, old, newPassword);
-	}
-
-	protected void passwordChanged(String newValue) {
-		String old = this.password;
-		this.password = newValue;
-		this.firePropertyChanged(PASSWORD_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultPassword() {
-		return DEFAULT_PASSWORD;
-	}
-
-	// ********** BindParameters **********
-	public Boolean getBindParameters() {
-		return this.bindParameters;
-	}
-
-	public void setBindParameters(Boolean newBindParameters) {
-		this.preSetProperty();
-		
-		Boolean old = this.bindParameters;
-		this.bindParameters = newBindParameters;
-		this.putProperty(BIND_PARAMETERS_PROPERTY, newBindParameters);
-		this.firePropertyChanged(BIND_PARAMETERS_PROPERTY, old, newBindParameters);
-	}
-
-	private void bindParametersChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.bindParameters;
-		this.bindParameters = newValue;
-		this.firePropertyChanged(BIND_PARAMETERS_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultBindParameters() {
-		return DEFAULT_BIND_PARAMETERS;
-	}
-
-	// ********** ReadConnectionsShared **********
-	public Boolean getReadConnectionsShared() {
-		return this.readConnectionsShared;
-	}
-
-	public void setReadConnectionsShared(Boolean newReadConnectionsShared) {
-		this.preSetProperty();
-		
-		Boolean old = this.readConnectionsShared;
-		this.readConnectionsShared = newReadConnectionsShared;
-		this.putProperty(READ_CONNECTIONS_SHARED_PROPERTY, newReadConnectionsShared);
-		this.firePropertyChanged(READ_CONNECTIONS_SHARED_PROPERTY, old, newReadConnectionsShared);
-	}
-
-	private void readConnectionsSharedChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.readConnectionsShared;
-		this.readConnectionsShared = newValue;
-		this.firePropertyChanged(READ_CONNECTIONS_SHARED_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultReadConnectionsShared() {
-		return DEFAULT_READ_CONNECTIONS_SHARED;
-	}
-
-	// ********** ReadConnectionsMin **********
-	public Integer getReadConnectionsMin() {
-		return this.readConnectionsMin;
-	}
-
-	public void setReadConnectionsMin(Integer newReadConnectionsMin) {
-		this.preSetProperty();
-		
-		Integer old = this.readConnectionsMin;
-		this.readConnectionsMin = newReadConnectionsMin;
-		this.putProperty(READ_CONNECTIONS_MIN_PROPERTY, newReadConnectionsMin);
-		this.firePropertyChanged(READ_CONNECTIONS_MIN_PROPERTY, old, newReadConnectionsMin);
-	}
-
-	private void readConnectionsMinChanged(String stringValue) {
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.readConnectionsMin;
-		this.readConnectionsMin = newValue;
-		this.firePropertyChanged(READ_CONNECTIONS_MIN_PROPERTY, old, newValue);
-	}
-
-	public Integer getDefaultReadConnectionsMin() {
-		return DEFAULT_READ_CONNECTIONS_MIN;
-	}
-
-	// ********** ReadConnectionsMax **********
-	public Integer getReadConnectionsMax() {
-		return this.readConnectionsMax;
-	}
-
-	public void setReadConnectionsMax(Integer newReadConnectionsMax) {
-		this.preSetProperty();
-		
-		Integer old = this.readConnectionsMax;
-		this.readConnectionsMax = newReadConnectionsMax;
-		this.putProperty(READ_CONNECTIONS_MAX_PROPERTY, newReadConnectionsMax);
-		this.firePropertyChanged(READ_CONNECTIONS_MAX_PROPERTY, old, newReadConnectionsMax);
-	}
-
-	private void readConnectionsMaxChanged(String stringValue) {
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.readConnectionsMax;
-		this.readConnectionsMax = newValue;
-		this.firePropertyChanged(READ_CONNECTIONS_MAX_PROPERTY, old, newValue);
-	}
-
-	public Integer getDefaultReadConnectionsMax() {
-		return DEFAULT_READ_CONNECTIONS_MAX;
-	}
-
-	// ********** WriteConnectionsMin **********
-	public Integer getWriteConnectionsMin() {
-		return this.writeConnectionsMin;
-	}
-
-	public void setWriteConnectionsMin(Integer newWriteConnectionsMin) {
-		this.preSetProperty();
-		
-		Integer old = this.writeConnectionsMin;
-		this.writeConnectionsMin = newWriteConnectionsMin;
-		this.putProperty(WRITE_CONNECTIONS_MIN_PROPERTY, newWriteConnectionsMin);
-		this.firePropertyChanged(WRITE_CONNECTIONS_MIN_PROPERTY, old, newWriteConnectionsMin);
-	}
-
-	private void writeConnectionsMinChanged(String stringValue) {
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.writeConnectionsMin;
-		this.writeConnectionsMin = newValue;
-		this.firePropertyChanged(WRITE_CONNECTIONS_MIN_PROPERTY, old, newValue);
-	}
-
-	public Integer getDefaultWriteConnectionsMin() {
-		return DEFAULT_WRITE_CONNECTIONS_MIN;
-	}
-
-	// ********** WriteConnectionsMax **********
-	public Integer getWriteConnectionsMax() {
-		return this.writeConnectionsMax;
-	}
-
-	public void setWriteConnectionsMax(Integer newWriteConnectionsMax) {
-		this.preSetProperty();
-		
-		Integer old = this.writeConnectionsMax;
-		this.writeConnectionsMax = newWriteConnectionsMax;
-		this.putProperty(WRITE_CONNECTIONS_MAX_PROPERTY, newWriteConnectionsMax);
-		this.firePropertyChanged(WRITE_CONNECTIONS_MAX_PROPERTY, old, newWriteConnectionsMax);
-	}
-
-	private void writeConnectionsMaxChanged(String stringValue) {
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.writeConnectionsMax;
-		this.writeConnectionsMax = newValue;
-		this.firePropertyChanged(WRITE_CONNECTIONS_MAX_PROPERTY, old, newValue);
-	}
-
-	public Integer getDefaultWriteConnectionsMax() {
-		return DEFAULT_WRITE_CONNECTIONS_MAX;
-	}
-
-	// ********** ExclusiveConnectionMode **********
-	
-	public ExclusiveConnectionMode getExclusiveConnectionMode() {
-		return this.exclusiveConnectionMode;
-	}
-	
-	public void setExclusiveConnectionMode(ExclusiveConnectionMode newExclusiveConnectionMode) {
-		this.preSetProperty();
-		
-		ExclusiveConnectionMode old = this.exclusiveConnectionMode;
-		this.exclusiveConnectionMode = newExclusiveConnectionMode;
-		this.putProperty(EXCLUSIVE_CONNECTION_MODE_PROPERTY, newExclusiveConnectionMode);
-		this.firePropertyChanged(EXCLUSIVE_CONNECTION_MODE_PROPERTY, old, newExclusiveConnectionMode);
-	}
-
-	private void exclusiveConnectionModeChanged(String stringValue) {
-		ExclusiveConnectionMode newValue = getEnumValueOf(stringValue, ExclusiveConnectionMode.values());
-		ExclusiveConnectionMode old = this.exclusiveConnectionMode;
-		this.exclusiveConnectionMode = newValue;
-		this.firePropertyChanged(EXCLUSIVE_CONNECTION_MODE_PROPERTY, old, newValue);
-	}
-	
-	public ExclusiveConnectionMode getDefaultExclusiveConnectionMode() {
-		return DEFAULT_EXCLUSIVE_CONNECTION_MODE;
-	}
-
-	// ********** LazyConnection **********
-	public Boolean getLazyConnection() {
-		return this.lazyConnection;
-	}
-
-	public void setLazyConnection(Boolean newLazyConnection) {
-		this.preSetProperty();
-		
-		Boolean old = this.lazyConnection;
-		this.lazyConnection = newLazyConnection;
-		this.putProperty(LAZY_CONNECTION_PROPERTY, newLazyConnection);
-		this.firePropertyChanged(LAZY_CONNECTION_PROPERTY, old, newLazyConnection);
-	}
-
-	private void lazyConnectionChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.lazyConnection;
-		this.lazyConnection = newValue;
-		this.firePropertyChanged(LAZY_CONNECTION_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultLazyConnection() {
-		return DEFAULT_LAZY_CONNECTION;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java
deleted file mode 100644
index 10e128a30a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/customization/EclipseLinkCustomization.java
+++ /dev/null
@@ -1,871 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.customization;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Customization;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Entity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Profiler;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Weaving;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.text.edits.ReplaceEdit;
-
-/**
- *  EclipseLinkCustomization
- */
-public class EclipseLinkCustomization extends EclipseLinkPersistenceUnitProperties
-	implements Customization
-{
-	// ********** EclipseLink properties **********
-	private Boolean throwExceptions;
-	private Weaving weaving;
-	private Boolean weavingLazy;
-	private Boolean weavingChangeTracking;
-	private Boolean weavingFetchGroups;
-	private Boolean weavingInternal;
-	private Boolean weavingEager;
-	private Boolean validationOnly;
-	private Boolean validateSchema;
-	private List<String> sessionCustomizers;
-	private String profiler; // storing EclipseLinkStringValue since value can be Profiler or custom class
-	private String exceptionHandler;
-
-	private List<Entity> entities;
-	
-	// ********** constructors **********
-	public EclipseLinkCustomization(PersistenceUnit parent) {
-		super(parent);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		this.entities = new ArrayList<Entity>();
-
-		this.throwExceptions = 
-			this.getBooleanValue(ECLIPSELINK_THROW_EXCEPTIONS);
-		this.weaving = 
-			this.getEnumValue(ECLIPSELINK_WEAVING, Weaving.values());
-		this.weavingLazy = 
-			this.getBooleanValue(ECLIPSELINK_WEAVING_LAZY);
-		this.weavingChangeTracking = 
-			this.getBooleanValue(ECLIPSELINK_WEAVING_CHANGE_TRACKING);
-		this.weavingFetchGroups = 
-			this.getBooleanValue(ECLIPSELINK_WEAVING_FETCH_GROUPS);
-		this.weavingInternal = 
-			this.getBooleanValue(ECLIPSELINK_WEAVING_INTERNAL);
-		this.weavingEager = 
-			this.getBooleanValue(ECLIPSELINK_WEAVING_EAGER);
-		this.validationOnly = 
-			this.getBooleanValue(ECLIPSELINK_VALIDATION_ONLY);
-		this.validateSchema = 
-			this.getBooleanValue(ECLIPSELINK_VALIDATE_SCHEMA);
-		this.initializeSessionCustomizersFromPersistenceUnit();
-
-		Set<PersistenceUnit.Property> properties = 
-			this.getPropertiesSetWithPrefix(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER);
-		this.initializeEntitiesCustomizerClass(properties);
-		
-		this.profiler = this.getProfilerPropertyValue();
-		this.exceptionHandler = 
-			this.getStringValue(ECLIPSELINK_EXCEPTION_HANDLER);
-	}
-
-	private void initializeSessionCustomizersFromPersistenceUnit() {
-		this.sessionCustomizers = this.buildSessionCustomizers();
-	}
-
-	private List<String> buildSessionCustomizers() {
-		return CollectionTools.list(this.convertToValues(this.getPropertiesSetWithPrefix(ECLIPSELINK_SESSION_CUSTOMIZER)));
-	}
-
-	private Iterable<String> convertToValues(Iterable<PersistenceUnit.Property> properties) {
-		return new TransformationIterable<PersistenceUnit.Property, String>(properties) {
-			@Override
-			protected String transform(PersistenceUnit.Property property) {
-				return property.getValue();
-			}
-		};
-	}
-
-	private void initializeEntitiesCustomizerClass(Set<PersistenceUnit.Property> descriptorCustomizerProperties) {
-		for (PersistenceUnit.Property descriptorCustomizerProperty : descriptorCustomizerProperties) {
-			this.setEntityDescriptorCustomizerOf(descriptorCustomizerProperty);
-		}
-	}
-
-	/**
-	 * Gets the Profiler property from the persistence unit.
-	 */
-	private String getProfilerPropertyValue() {
-
-		String value = this.getStringValue(ECLIPSELINK_PROFILER);
-		if (value == null) {
-			return null;	// no property found
-		}
-		Profiler standardProfiler = this.getEnumValue(ECLIPSELINK_PROFILER, Profiler.values());
-		return (standardProfiler == null) ? value : getPropertyStringValueOf(standardProfiler);
-	}
-
-	// ********** behavior **********
-	
-	public void propertyValueChanged(String propertyName, String newValue) {
-		if (propertyName.equals(ECLIPSELINK_THROW_EXCEPTIONS)) {
-			this.throwExceptionsChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING)) {
-			this.weavingChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_LAZY)) {
-			this.weavingLazyChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_CHANGE_TRACKING)) {
-			this.weavingChangeTrackingChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_FETCH_GROUPS)) {
-			this.weavingFetchGroupsChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_INTERNAL)) {
-			this.weavingInternalChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_EAGER)) {
-			this.weavingEagerChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_VALIDATION_ONLY)) {
-			this.validationOnlyChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_VALIDATE_SCHEMA)) {
-			this.validateSchemaChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSION_CUSTOMIZER)) {
-			this.sessionCustomizersChanged();
-		}
-		else if (propertyName.startsWith(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER)) {
-			this.descriptorCustomizerChanged(propertyName, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_PROFILER)) {
-			this.profilerChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EXCEPTION_HANDLER)) {
-			this.exceptionHandlerChanged(newValue);
-		}
-	}
-		
-	public void propertyRemoved(String propertyName) {
-		if (propertyName.equals(ECLIPSELINK_THROW_EXCEPTIONS)) {
-			this.throwExceptionsChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING)) {
-			this.weavingChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_LAZY)) {
-			this.weavingLazyChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_CHANGE_TRACKING)) {
-			this.weavingChangeTrackingChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_FETCH_GROUPS)) {
-			this.weavingFetchGroupsChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_INTERNAL)) {
-			this.weavingInternalChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVING_EAGER)) {
-			this.weavingEagerChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_VALIDATION_ONLY)) {
-			this.validationOnlyChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_VALIDATE_SCHEMA)) {
-			this.validateSchemaChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSION_CUSTOMIZER)) {
-			this.sessionCustomizersChanged();
-		}
-		else if (propertyName.startsWith(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER)) {
-			this.descriptorCustomizerChanged(propertyName, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_PROFILER)) {
-			this.profilerChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EXCEPTION_HANDLER)) {
-			this.exceptionHandlerChanged(null);
-		}
-		
-	}
-
-	/**
-	 * Adds property names key/value pairs, where: 
-	 * 		key = EclipseLink property key
-	 * 		value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		propertyNames.put(
-			ECLIPSELINK_THROW_EXCEPTIONS,
-			THROW_EXCEPTIONS_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WEAVING,
-			WEAVING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WEAVING_LAZY,
-			WEAVING_LAZY_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WEAVING_CHANGE_TRACKING,
-			WEAVING_CHANGE_TRACKING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WEAVING_FETCH_GROUPS,
-			WEAVING_FETCH_GROUPS_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WEAVING_INTERNAL,
-			WEAVING_INTERNAL_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WEAVING_EAGER,
-			WEAVING_EAGER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_VALIDATION_ONLY,
-			VALIDATION_ONLY_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_VALIDATE_SCHEMA,
-			VALIDATE_SCHEMA_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_SESSION_CUSTOMIZER,
-			SESSION_CUSTOMIZER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_PROFILER,
-			PROFILER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_EXCEPTION_HANDLER,
-			EXCEPTION_HANDLER_PROPERTY);
-
-		// Don't need to initialize propertyNames for: 
-		// descriptorCustomizerProperty
-	}
-
-	/**
-	 * Method used for identifying the given property.
-	 */
-	@Override
-	public boolean itemIsProperty(PersistenceUnit.Property item) {
-		boolean isProperty = super.itemIsProperty(item);
-		
-		if ( ! isProperty && item.getName() != null) {
-				if (item.getName().startsWith(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER)) {
-					return true;
-				}
-		}
-		return isProperty;
-	}
-
-	/**
-	 * Returns the property name used for change notification of the given
-	 * property.
-	 */
-	@Override
-	public String propertyIdOf(PersistenceUnit.Property property) {
-		try {
-			return super.propertyIdOf(property);
-		}
-		catch (IllegalArgumentException e) {
-			if (property.getName().startsWith(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER)) {
-				return DESCRIPTOR_CUSTOMIZER_PROPERTY;
-			}
-		}
-		throw new IllegalArgumentException("Illegal property: " + property); //$NON-NLS-1$
-	}
-	
-	public Entity addEntity(String entityName) {
-		if (this.entityExists(entityName)) {
-			throw new IllegalStateException("Duplicate entity: " + entityName); //$NON-NLS-1$
-		}
-		Entity newEntity = this.buildEntity(entityName);
-		this.addItemToList(newEntity, this.entities, ENTITIES_LIST);
-		return newEntity;
-	}
-
-	public void removeEntity(String entityName) {
-		if ( ! this.entityExists(entityName)) {
-			return;
-		}
-		Entity entity = this.getEntityNamed(entityName);
-		this.clearEntity(entity);
-		this.removeEntity(entity);
-	}
-
-	
-	// ********** ThrowExceptions **********
-	public Boolean getThrowExceptions() {
-		return this.throwExceptions;
-	}
-	
-	public void setThrowExceptions(Boolean newThrowExceptions) {
-		Boolean old = this.throwExceptions;
-		this.throwExceptions = newThrowExceptions;
-		this.putProperty(THROW_EXCEPTIONS_PROPERTY, newThrowExceptions);
-		this.firePropertyChanged(THROW_EXCEPTIONS_PROPERTY, old, newThrowExceptions);
-	}
-
-	private void throwExceptionsChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.throwExceptions;
-		this.throwExceptions = newValue;
-		this.firePropertyChanged(THROW_EXCEPTIONS_PROPERTY, old, newValue);
-	}
-	
-	public Boolean getDefaultThrowExceptions() {
-		return DEFAULT_THROW_EXCEPTIONS;
-	}
-
-	// ********** WeavingLazy **********
-	public Boolean getWeavingLazy() {
-		return this.weavingLazy;
-	}
-
-	public void setWeavingLazy(Boolean newWeavingLazy) {
-		Boolean old = this.weavingLazy;
-		this.weavingLazy = newWeavingLazy;
-		this.putProperty(WEAVING_LAZY_PROPERTY, newWeavingLazy);
-		this.firePropertyChanged(WEAVING_LAZY_PROPERTY, old, newWeavingLazy);
-	}
-
-	private void weavingLazyChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingLazy;
-		this.weavingLazy = newValue;
-		this.firePropertyChanged(WEAVING_LAZY_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultWeavingLazy() {
-		return DEFAULT_WEAVING_LAZY;
-	}
-
-	// ********** WeavingChangeTracking **********
-	public Boolean getWeavingChangeTracking() {
-		return this.weavingChangeTracking;
-	}
-
-	public void setWeavingChangeTracking(Boolean newWeavingChangeTracking) {
-		Boolean old = this.weavingChangeTracking;
-		this.weavingChangeTracking = newWeavingChangeTracking;
-		this.putProperty(WEAVING_CHANGE_TRACKING_PROPERTY, newWeavingChangeTracking);
-		this.firePropertyChanged(WEAVING_CHANGE_TRACKING_PROPERTY, old, newWeavingChangeTracking);
-	}
-
-	private void weavingChangeTrackingChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingChangeTracking;
-		this.weavingChangeTracking = newValue;
-		this.firePropertyChanged(WEAVING_CHANGE_TRACKING_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultWeavingChangeTracking() {
-		return DEFAULT_WEAVING_CHANGE_TRACKING;
-	}
-
-	// ********** WeavingFetchGroups **********
-	public Boolean getWeavingFetchGroups() {
-		return this.weavingFetchGroups;
-	}
-
-	public void setWeavingFetchGroups(Boolean newWeavingFetchGroups) {
-		Boolean old = this.weavingFetchGroups;
-		this.weavingFetchGroups = newWeavingFetchGroups;
-		this.putProperty(WEAVING_FETCH_GROUPS_PROPERTY, newWeavingFetchGroups);
-		this.firePropertyChanged(WEAVING_FETCH_GROUPS_PROPERTY, old, newWeavingFetchGroups);
-	}
-
-	private void weavingFetchGroupsChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingFetchGroups;
-		this.weavingFetchGroups = newValue;
-		this.firePropertyChanged(WEAVING_FETCH_GROUPS_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultWeavingFetchGroups() {
-		return DEFAULT_WEAVING_FETCH_GROUPS;
-	}
-
-	// ********** WeavingInternal **********
-	public Boolean getWeavingInternal() {
-		return this.weavingInternal;
-	}
-
-	public void setWeavingInternal(Boolean newWeavingInternal) {
-		Boolean old = this.weavingInternal;
-		this.weavingInternal = newWeavingInternal;
-		this.putProperty(WEAVING_INTERNAL_PROPERTY, newWeavingInternal);
-		this.firePropertyChanged(WEAVING_INTERNAL_PROPERTY, old, newWeavingInternal);
-	}
-
-	private void weavingInternalChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingInternal;
-		this.weavingInternal = newValue;
-		this.firePropertyChanged(WEAVING_INTERNAL_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultWeavingInternal() {
-		return DEFAULT_WEAVING_INTERNAL;
-	}
-
-	// ********** WeavingEager **********
-	public Boolean getWeavingEager() {
-		return this.weavingEager;
-	}
-
-	public void setWeavingEager(Boolean newWeavingEager) {
-		Boolean old = this.weavingEager;
-		this.weavingEager = newWeavingEager;
-		this.putProperty(WEAVING_EAGER_PROPERTY, newWeavingEager);
-		this.firePropertyChanged(WEAVING_EAGER_PROPERTY, old, newWeavingEager);
-	}
-
-	private void weavingEagerChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.weavingEager;
-		this.weavingEager = newValue;
-		this.firePropertyChanged(WEAVING_EAGER_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultWeavingEager() {
-		return DEFAULT_WEAVING_EAGER;
-	}
-
-	// ********** ValidationOnly **********
-	public Boolean getValidationOnly() {
-		return this.validationOnly;
-	}
-
-	public void setValidationOnly(Boolean newValidationOnly) {
-		Boolean old = this.validationOnly;
-		this.validationOnly = newValidationOnly;
-		this.putProperty(VALIDATION_ONLY_PROPERTY, newValidationOnly);
-		this.firePropertyChanged(VALIDATION_ONLY_PROPERTY, old, newValidationOnly);
-	}
-
-	private void validationOnlyChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.validationOnly;
-		this.validationOnly = newValue;
-		this.firePropertyChanged(VALIDATION_ONLY_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultValidationOnly() {
-		return DEFAULT_VALIDATION_ONLY;
-	}
-
-	// ********** ValidateSchema **********
-	public Boolean getValidateSchema() {
-		return this.validateSchema;
-	}
-
-	public void setValidateSchema(Boolean newValidateSchema) {
-		Boolean old = this.validateSchema;
-		this.validateSchema = newValidateSchema;
-		this.putProperty(VALIDATE_SCHEMA_PROPERTY, newValidateSchema);
-		this.firePropertyChanged(VALIDATE_SCHEMA_PROPERTY, old, newValidateSchema);
-	}
-
-	private void validateSchemaChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.validateSchema;
-		this.validateSchema = newValue;
-		this.firePropertyChanged(VALIDATE_SCHEMA_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultValidateSchema() {
-		return DEFAULT_VALIDATE_SCHEMA;
-	}
-
-	// ********** SessionCustomizers **********
-	public ListIterable<String> getSessionCustomizers(){
-		return new LiveCloneListIterable<String>(this.sessionCustomizers);
-	}
-	
-	public int getSessionCustomizersSize(){
-		return this.sessionCustomizers.size();
-	}
-
-	public boolean sessionCustomizerExists(String sessionCustomizerClassName) {
-
-		for (String sessionCustomizer : this.sessionCustomizers) {
-			if(sessionCustomizer.equals(sessionCustomizerClassName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String addSessionCustomizer(String newSessionCustomizerClassName){
-
-		if( ! this.sessionCustomizerExists(newSessionCustomizerClassName)) {
-			this.addItemToList(newSessionCustomizerClassName, this.sessionCustomizers, SESSION_CUSTOMIZER_LIST);
-			this.putProperty(SESSION_CUSTOMIZER_PROPERTY, newSessionCustomizerClassName, true);
-			return newSessionCustomizerClassName;
-		}
-		return null;
-	}
-	
-	public void removeSessionCustomizer(String className){
-		if (this.removeItemFromList(className, this.sessionCustomizers, SESSION_CUSTOMIZER_LIST)) {
-			this.removeProperty(SESSION_CUSTOMIZER_PROPERTY, className);
-		}
-	}
-	
-	private void sessionCustomizersChanged() {
-		this.synchronizeList(this.buildSessionCustomizers(), this.sessionCustomizers, SESSION_CUSTOMIZER_LIST);
-	}
-
-	// ********** Weaving **********
-	
-	public Weaving getWeaving() {
-		return this.weaving;
-	}
-	
-	public void setWeaving(Weaving newWeaving) {
-		Weaving old = this.weaving;
-		this.weaving = newWeaving;
-		this.putProperty(WEAVING_PROPERTY, newWeaving);
-		this.firePropertyChanged(WEAVING_PROPERTY, old, newWeaving);
-	}
-
-	private void weavingChanged(String stringValue) {
-		Weaving newValue = getEnumValueOf(stringValue, Weaving.values());
-		Weaving old = this.weaving;
-		this.weaving = newValue;
-		this.firePropertyChanged(WEAVING_PROPERTY, old, newValue);
-	}
-	
-	public Weaving getDefaultWeaving() {
-		return DEFAULT_WEAVING;
-	}
-
-	// ********** ExceptionHandler **********
-	public String getExceptionHandler() {
-		return this.exceptionHandler;
-	}
-
-	public void setExceptionHandler(String newExceptionHandler) {
-		String old = this.exceptionHandler;
-		this.exceptionHandler = newExceptionHandler;
-		this.putProperty(EXCEPTION_HANDLER_PROPERTY, newExceptionHandler);
-		this.firePropertyChanged(EXCEPTION_HANDLER_PROPERTY, old, newExceptionHandler);
-	}
-
-	private void exceptionHandlerChanged(String newValue) {
-		String old = this.exceptionHandler;
-		this.exceptionHandler = newValue;
-		this.firePropertyChanged(EXCEPTION_HANDLER_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultExceptionHandler() {
-		return DEFAULT_EXCEPTION_HANDLER;
-	}
-
-	// ********** DescriptorCustomizer **********
-	
-	public String getDescriptorCustomizerOf(String entityName) {
-		Entity entity = this.getEntityNamed(entityName);
-		return (entity == null) ? null : entity.getDescriptorCustomizer();
-	}
-	
-	public void setDescriptorCustomizerOf(String entityName, String newDescriptorCustomizer) {
-		Entity old = this.setEntityDescriptorCustomizerOf(entityName, newDescriptorCustomizer);
-		this.putStringValue(ECLIPSELINK_DESCRIPTOR_CUSTOMIZER, entityName, newDescriptorCustomizer, false);
-		this.firePropertyChanged(DESCRIPTOR_CUSTOMIZER_PROPERTY, old, this.getEntityNamed(entityName));
-	}
-	
-	private void descriptorCustomizerChanged(String propertyName, String stringValue) {
-		String entityName = this.extractEntityNameOf(propertyName);
-		if( ! StringTools.stringIsEmpty(entityName)) {
-			Entity old = this.setEntityDescriptorCustomizerOf(entityName, stringValue);
-			this.firePropertyChanged(DESCRIPTOR_CUSTOMIZER_PROPERTY, old, this.getEntityNamed(entityName));
-		}
-	}
-	
-	public String getDefaultDescriptorCustomizer() {
-		return DEFAULT_DESCRIPTOR_CUSTOMIZER;
-	}
-
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntityDescriptorCustomizerOf(String entityName, String descriptorCustomizerClassName) {
-		 if(( ! this.entityExists(entityName)) && StringTools.stringIsEmpty(descriptorCustomizerClassName)) {
-				//this is a property that is currently being added, we don't need to deal with it until the value is set
-				 return null;
-			 }
-		Entity entity = (this.entityExists(entityName)) ?
-						this.getEntityNamed(entityName) :
-						this.addEntity(entityName);
-		return this.setEntityDescriptorCustomizerOf(entity, descriptorCustomizerClassName);
-	}
-	
-	/**
-	 * Returns the old Entity
-	 */
-	private Entity setEntityDescriptorCustomizerOf(Entity entity, String descriptorCustomizerClassName) {
-		if(entity == null) {
-			throw new IllegalArgumentException();
-		}
-		Entity old = entity.clone();
-		entity.setDescriptorCustomizer(descriptorCustomizerClassName);
-		return old;
-	}
-	
-	/**
-	 * Convenience method to update the descriptorCustomizerClassName in entities.
-	 * Returns the old Entity
-	 */
-	private Entity setEntityDescriptorCustomizerOf(PersistenceUnit.Property descriptorCustomizerProperty) {
-		String entityName = this.extractEntityNameOf(descriptorCustomizerProperty);
-		if(StringTools.stringIsEmpty(entityName)) {
-			return null;
-		}
-		return this.setEntityDescriptorCustomizerOf(entityName, descriptorCustomizerProperty.getValue());
-	}
-
-	// ********** Profiler **********
-	/**
-	 * Returns Profiler or custom profiler class.
-	 * 
-	 * @return EclipseLink string value for Profiler enum or custom profiler class
-	 */
-	public String getProfiler() {
-		return this.profiler;
-	}
-
-	/**
-	 * Sets EclipseLink profiler.
-	 * 
-	 * @param newProfiler - Profiler
-	 */
-	public void setProfiler(Profiler newProfiler) {
-		if( newProfiler == null) {
-			this.setProfiler_((String) null);
-			return;
-		}
-		this.setProfiler_(getPropertyStringValueOf(newProfiler));
-	}
-
-	/**
-	 * Sets EclipseLink profiler or custom profiler.
-	 * 
-	 * @param newProfiler -
-	 *            Can be a EclipseLink profiler literal or
-	 *            a fully qualified class name of a custom profiler.
-	 */
-	public void setProfiler(String newProfiler) {
-		if( newProfiler == null) {
-			this.setProfiler_((String) null);
-			return;
-		}
-		Profiler p = Profiler.getProfilerFor(newProfiler);
-		if(p == null) {	// custom profiler class
-			this.setProfiler_(newProfiler);
-		}
-		else {
-			this.setProfiler(p);
-		}
-	}
-	
-	private void setProfiler_(String newProfiler) {
-		String old = this.profiler;
-		this.profiler = newProfiler;
-		this.putProperty(PROFILER_PROPERTY, newProfiler);
-		this.firePropertyChanged(PROFILER_PROPERTY, old, newProfiler);
-	}
-
-	private void profilerChanged(String newValue) {
-		String old = this.profiler;
-		this.profiler = newValue;
-		this.firePropertyChanged(PROFILER_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultProfiler() {
-		return DEFAULT_PROFILER;
-	}
-
-
-	// ****** convenience methods *******
-
-	/**
-	 * Set all Entity properties to default.
-	 */
-	private void clearEntity(Entity entity) {
-		if(entity.isEmpty()) {
-			return;
-		}
-		String entityName = entity.getName();
-		this.setDescriptorCustomizerOf(entityName, null);
-	}
-
-	/**
-	 * Returns the Entity with the given name.
-	 */
-	private Entity getEntityNamed(String name) {
-		for(Entity entity: this.entities) {
-			if(entity.getName().equals(name)) {
-				return entity;
-			}
-		}
-		return null;
-	}
-
-	private Entity buildEntity(String name) {
-		return new Entity(this, name);
-	}
-	
-	private void removeEntity(Entity entity) {
-		if(entity == null) {
-			throw new NullPointerException();
-		}
-		this.removeItemFromList(entity, this.entities, ENTITIES_LIST);
-	}
-
-	/**
-	 * Return whether the Entity exist.
-	 */
-	public boolean entityExists(String name) {
-		for(Entity entity: this.entities) {
-			if(entity.getName().equals(name)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// ****** entities list *******
-
-	public ListIterable<Entity> getEntities() {
-		return new LiveCloneListIterable<Entity>(this.entities);
-	}
-
-	public Iterable<String> getEntityNames() {
-		return new TransformationIterable<Entity, String>(this.getEntities()) {
-			@Override
-			protected String transform(Entity entity) {
-				return entity.getName();
-			}
-		};
-	}
-
-	public int getEntitiesSize() {
-		return this.entities.size();
-	}
-
-
-	// ********** refactoring ************
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createSessionCustomizerRenameTypeEdits(originalType, newName),
-				this.createExceptionHandlerRenameTypeEdits(originalType, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createSessionCustomizerRenameTypeEdits(final IType originalType, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<PersistenceUnit.Property, Iterable<ReplaceEdit>>(getPersistenceUnit().getPropertiesNamed(ECLIPSELINK_SESSION_CUSTOMIZER)) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(PersistenceUnit.Property property) {
-					return property.createRenameTypeEdits(originalType, newName);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createExceptionHandlerRenameTypeEdits(IType originalType, String newName) {
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_EXCEPTION_HANDLER);
-		return (property != null) ?
-				property.createRenameTypeEdits(originalType, newName) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createSessionCustomizerMoveTypeEdits(originalType, newPackage),
-				this.createExceptionHandlerMoveTypeEdits(originalType, newPackage)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createSessionCustomizerMoveTypeEdits(final IType originalType, final IPackageFragment newPackage) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<PersistenceUnit.Property, Iterable<ReplaceEdit>>(getPersistenceUnit().getPropertiesNamed(ECLIPSELINK_SESSION_CUSTOMIZER)) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(PersistenceUnit.Property property) {
-					return property.createMoveTypeEdits(originalType, newPackage);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createExceptionHandlerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_EXCEPTION_HANDLER);
-		return (property != null) ?
-				property.createMoveTypeEdits(originalType, newPackage) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-				this.createSessionCustomizerRenamePackageEdits(originalPackage, newName),
-				this.createExceptionHandlerRenamePackageEdits(originalPackage, newName)
-			);
-	}
-
-	protected Iterable<ReplaceEdit> createSessionCustomizerRenamePackageEdits(final IPackageFragment originalPackage, final String newName) {
-		return new CompositeIterable<ReplaceEdit>(
-			new TransformationIterable<PersistenceUnit.Property, Iterable<ReplaceEdit>>(getPersistenceUnit().getPropertiesNamed(ECLIPSELINK_SESSION_CUSTOMIZER)) {
-				@Override
-				protected Iterable<ReplaceEdit> transform(PersistenceUnit.Property property) {
-					return property.createRenamePackageEdits(originalPackage, newName);
-				}
-			}
-		);
-	}
-
-	protected Iterable<ReplaceEdit> createExceptionHandlerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_EXCEPTION_HANDLER);
-		return (property != null) ?
-				property.createRenamePackageEdits(originalPackage, newName) :
-				EmptyIterable.<ReplaceEdit>instance();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/general/EclipseLinkGeneralProperties.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/general/EclipseLinkGeneralProperties.java
deleted file mode 100644
index ca9e314690..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/general/EclipseLinkGeneralProperties.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.general;
-
-import java.util.Map;
-
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.general.GeneralProperties;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-
-/**
- *  EclipseLinkGeneralProperties
- */
-public class EclipseLinkGeneralProperties extends EclipseLinkPersistenceUnitProperties
-	implements GeneralProperties
-{
-	// ********** EclipseLink properties **********
-	private Boolean excludeEclipselinkOrm;
-
-	// ********** constructors **********
-	public EclipseLinkGeneralProperties(PersistenceUnit parent) {
-		super(parent);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		
-		this.excludeEclipselinkOrm = 
-			this.getBooleanValue(ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM);
-	}
-
-
-	// ********** behavior **********
-	
-	public void propertyValueChanged(String propertyName, String newValue) {
-		if (propertyName.equals(ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM)) {
-			excludeEclipselinkOrmChanged(newValue);
-		}
-	}
-	
-	public void propertyRemoved(String propertyName) {
-		if (propertyName.equals(ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM)) {
-			excludeEclipselinkOrmChanged(null);			
-		}
-	}
-	
-	
-	/**
-	 * Adds property names key/value pairs, where: 
-	 * 		key = EclipseLink property key
-	 * 		value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		propertyNames.put(
-			ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM,
-			EXCLUDE_ECLIPSELINK_ORM_PROPERTY);
-	}
-
-	
-	// ********** ExcludeEclipselinkOrm **********
-	public Boolean getExcludeEclipselinkOrm() {
-		return this.excludeEclipselinkOrm;
-	}
-
-	public void setExcludeEclipselinkOrm(Boolean newExcludeEclipselinkOrm) {
-		Boolean old = this.excludeEclipselinkOrm;
-		this.excludeEclipselinkOrm = newExcludeEclipselinkOrm;
-		this.putProperty(EXCLUDE_ECLIPSELINK_ORM_PROPERTY, newExcludeEclipselinkOrm);
-		this.firePropertyChanged(EXCLUDE_ECLIPSELINK_ORM_PROPERTY, old, newExcludeEclipselinkOrm);
-	}
-
-	private void excludeEclipselinkOrmChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.excludeEclipselinkOrm;
-		this.excludeEclipselinkOrm = newValue;
-		this.firePropertyChanged(EXCLUDE_ECLIPSELINK_ORM_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultExcludeEclipselinkOrm() {
-		return DEFAULT_EXCLUDE_ECLIPSELINK_ORM;
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java
deleted file mode 100644
index f8fe7b22e7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/logging/EclipseLinkLogging.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.logging;
-
-import java.util.Map;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.Logger;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.Logging;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.LoggingLevel;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.text.edits.ReplaceEdit;
-
-/**
- *  EclipseLinkLogging
- */
-public class EclipseLinkLogging extends EclipseLinkPersistenceUnitProperties
-	implements Logging
-{
-	// ********** EclipseLink properties **********
-	private LoggingLevel level;
-	private Boolean timestamp;
-	private Boolean thread;
-	private Boolean session;
-	private Boolean exceptions;
-	private String logFileLocation;
-	private String logger; // storing EclipseLinkStringValue since value can be Logger or custom class
-
-	// ********** constructors **********
-	public EclipseLinkLogging(PersistenceUnit parent) {
-		super(parent);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		// TOREVIEW - handle incorrect String in persistence.xml
-		this.level = 
-			this.getEnumValue(ECLIPSELINK_LEVEL, LoggingLevel.values());
-		this.timestamp = 
-			this.getBooleanValue(ECLIPSELINK_TIMESTAMP);
-		this.thread = 
-			this.getBooleanValue(ECLIPSELINK_THREAD);
-		this.session = 
-			this.getBooleanValue(ECLIPSELINK_SESSION);
-		this.exceptions = 
-			this.getBooleanValue(ECLIPSELINK_EXCEPTIONS);
-		this.logFileLocation = 
-			this.getStringValue(ECLIPSELINK_LOG_FILE_LOCATION);
-		
-		this.logger = this.getLoggerProtertyValue();
-	}
-
-	/**
-	 * Gets the Logger property from the persistence unit.
-	 */
-	private String getLoggerProtertyValue() {
-
-		String value = this.getStringValue(ECLIPSELINK_LOGGER);
-		if (value == null) {
-			return null;	// no property found
-		}
-		Logger standardLogger = this.getEnumValue(ECLIPSELINK_LOGGER, Logger.values());
-		return (standardLogger == null) ? value : getPropertyStringValueOf(standardLogger);
-	}
-
-	// ********** behavior **********
-	
-	public void propertyValueChanged(String propertyName, String newValue) {
-		if (propertyName.equals(ECLIPSELINK_LEVEL)) {
-			this.levelChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TIMESTAMP)) {
-			this.timestampChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_THREAD)) {
-			this.threadChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSION)) {
-			this.sessionChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EXCEPTIONS)) {
-			this.exceptionsChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_LOG_FILE_LOCATION)) {
-			this.logFileLocationChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_LOGGER)) {
-			this.loggerChanged(newValue);
-		}
-	}
-		
-	public void propertyRemoved(String propertyName) {
-		if (propertyName.equals(ECLIPSELINK_LEVEL)) {
-			this.levelChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TIMESTAMP)) {
-			this.timestampChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_THREAD)) {
-			this.threadChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSION)) {
-			this.sessionChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EXCEPTIONS)) {
-			this.exceptionsChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_LOG_FILE_LOCATION)) {
-			this.logFileLocationChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_LOGGER)) {
-			this.loggerChanged(null);
-		}
-	}
-
-	/**
-	 * Adds property names key/value pairs, where: 
-	 * 		key = EclipseLink property key
-	 * 		value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		propertyNames.put(
-			ECLIPSELINK_LEVEL,
-			LEVEL_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_TIMESTAMP,
-			TIMESTAMP_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_THREAD,
-			THREAD_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_SESSION,
-			SESSION_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_EXCEPTIONS,
-			EXCEPTIONS_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_LOG_FILE_LOCATION,
-			LOG_FILE_LOCATION_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_LOGGER,
-			LOGGER_PROPERTY);
-	}
-
-	// ********** LoggingLevel **********
-	
-	public LoggingLevel getLevel() {
-		return this.level;
-	}
-	
-	public void setLevel(LoggingLevel newLevel) {
-		LoggingLevel old = this.level;
-		this.level = newLevel;
-		this.putProperty(LEVEL_PROPERTY, newLevel);
-		this.firePropertyChanged(LEVEL_PROPERTY, old, newLevel);
-	}
-
-	private void levelChanged(String stringValue) {
-		LoggingLevel newValue = getEnumValueOf(stringValue, LoggingLevel.values());
-		LoggingLevel old = this.level;
-		this.level = newValue;
-		this.firePropertyChanged(LEVEL_PROPERTY, old, newValue);
-	}
-	
-	public LoggingLevel getDefaultLevel() {
-		return DEFAULT_LEVEL;
-	}
-
-	// ********** Timestamp **********
-	public Boolean getTimestamp() {
-		return this.timestamp;
-	}
-
-	public void setTimestamp(Boolean newTimestamp) {
-		Boolean old = this.timestamp;
-		this.timestamp = newTimestamp;
-		this.putProperty(TIMESTAMP_PROPERTY, newTimestamp);
-		this.firePropertyChanged(TIMESTAMP_PROPERTY, old, newTimestamp);
-	}
-
-	private void timestampChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.timestamp;
-		this.timestamp = newValue;
-		this.firePropertyChanged(TIMESTAMP_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultTimestamp() {
-		return DEFAULT_TIMESTAMP;
-	}
-
-	// ********** Thread **********
-	public Boolean getThread() {
-		return this.thread;
-	}
-
-	public void setThread(Boolean newThread) {
-		Boolean old = this.thread;
-		this.thread = newThread;
-		this.putProperty(THREAD_PROPERTY, newThread);
-		this.firePropertyChanged(THREAD_PROPERTY, old, newThread);
-	}
-
-	private void threadChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.thread;
-		this.thread = newValue;
-		this.firePropertyChanged(THREAD_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultThread() {
-		return DEFAULT_THREAD;
-	}
-
-	// ********** Session **********
-	public Boolean getSession() {
-		return this.session;
-	}
-
-	public void setSession(Boolean newSession) {
-		Boolean old = this.session;
-		this.session = newSession;
-		this.putProperty(SESSION_PROPERTY, newSession);
-		this.firePropertyChanged(SESSION_PROPERTY, old, newSession);
-	}
-
-	private void sessionChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.session;
-		this.session = newValue;
-		this.firePropertyChanged(SESSION_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultSession() {
-		return DEFAULT_SESSION;
-	}
-
-	// ********** Exceptions **********
-	public Boolean getExceptions() {
-		return this.exceptions;
-	}
-
-	public void setExceptions(Boolean newExceptions) {
-		Boolean old = this.exceptions;
-		this.exceptions = newExceptions;
-		this.putProperty(EXCEPTIONS_PROPERTY, newExceptions);
-		this.firePropertyChanged(EXCEPTIONS_PROPERTY, old, newExceptions);
-	}
-
-	private void exceptionsChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.exceptions;
-		this.exceptions = newValue;
-		this.firePropertyChanged(EXCEPTIONS_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultExceptions() {
-		return DEFAULT_EXCEPTIONS;
-	}
-
-	// ********** logFileLocation **********
-	public String getLogFileLocation() {
-		return this.logFileLocation;
-	}
-
-	public void setLogFileLocation(String newLogFileLocation) {
-		String old = this.logFileLocation;
-		this.logFileLocation = (StringTools.stringIsNotEmpty(newLogFileLocation)) ? 
-										newLogFileLocation : 
-										this.getDefaultLogFileLocation();
-		this.putProperty(LOG_FILE_LOCATION_PROPERTY, this.logFileLocation);
-		this.firePropertyChanged(LOG_FILE_LOCATION_PROPERTY, old, this.logFileLocation);
-	}
-
-	private void logFileLocationChanged(String newValue) {
-		String old = this.logFileLocation;
-		this.logFileLocation = newValue;
-		this.firePropertyChanged(LOG_FILE_LOCATION_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultLogFileLocation() {
-		return DEFAULT_LOG_FILE_LOCATION;
-	}
-
-	// ********** Logger **********
-	/**
-	 * Returns Logger or custom logger class.
-	 * 
-	 * @return EclipseLink string value for Logger enum or custom logger class
-	 */
-	public String getLogger() {
-		return this.logger;
-	}
-
-	/**
-	 * Sets EclipseLink logger.
-	 * 
-	 * @param newLogger - Logger
-	 */
-	public void setLogger(Logger newLogger) {
-		if( newLogger == null) {
-			this.setLogger_((String) null);
-			return;
-		}
-		this.setLogger_(getPropertyStringValueOf(newLogger));
-	}
-
-	/**
-	 * Sets EclipseLink logger or custom logger.
-	 * 
-	 * @param newLogger -
-	 *            Can be a EclipseLink logger literal or
-	 *            a fully qualified class name of a custom logger.
-	 */
-	public void setLogger(String newLogger) {
-		if( newLogger == null) {
-			this.setLogger_(null);
-			return;
-		}
-		Logger l = Logger.getLoggerFor(newLogger);
-		if(l == null) {	// custom Logger class
-			this.setLogger_(newLogger);
-		}
-		else {
-			this.setLogger(l);
-		}
-	}
-	
-	private void setLogger_(String newLogger) {
-		String old = this.logger;
-		this.logger = newLogger;
-		this.putProperty(LOGGER_PROPERTY, newLogger);
-		this.firePropertyChanged(LOGGER_PROPERTY, old, newLogger);
-	}
-
-	private void loggerChanged(String newValue) {
-		String old = this.logger;
-		this.logger = newValue;
-		this.firePropertyChanged(LOGGER_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultLogger() {
-		return DEFAULT_LOGGER;
-	}
-
-
-	// ********** refactoring ************
-
-	@Override
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return this.createLoggerRenameTypeEdits(originalType, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createLoggerRenameTypeEdits(IType originalType, String newName) {
-		//TODO seems like we should have the Property stored in a SessionCustomizer object instead of having to go 
-		//find all of the Properties from the persistence unit.
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_LOGGER);
-		if (property != null) {
-			return property.createRenameTypeEdits(originalType, newName);
-		}
-		return EmptyIterable.instance();
-	}
-
-	@Override
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.createLoggerMoveTypeEdits(originalType, newPackage);
-	}
-
-	protected Iterable<ReplaceEdit> createLoggerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_LOGGER);
-		if (property != null) {
-			return property.createMoveTypeEdits(originalType, newPackage);
-		}
-		return EmptyIterable.instance();
-	}
-
-	@Override
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.createLoggerRenamePackageEdits(originalPackage, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createLoggerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		//find all of the Properties from the persistence unit.
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_LOGGER);
-		if (property != null) {
-			return property.createRenamePackageEdits(originalPackage, newName);
-		}
-		return EmptyIterable.instance();
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java
deleted file mode 100644
index d4fbfb788a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/options/EclipseLinkOptions.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.options;
-
-import java.util.Map;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.options.Options;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.options.TargetDatabase;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.options.TargetServer;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-import org.eclipse.text.edits.ReplaceEdit;
-
-/**
- *  EclipseLinkOptions
- */
-public class EclipseLinkOptions extends EclipseLinkPersistenceUnitProperties
-	implements Options
-{
-	// ********** EclipseLink properties **********
-	private String sessionName;
-	private String sessionsXml;
-	private Boolean includeDescriptorQueries;
-	private String targetDatabase; // storing EclipseLinkStringValue since value can be TargetDatabase or custom class
-	private String targetServer; // storing EclipseLinkStringValue since value can be TargetServer or custom class
-	private String eventListener;
-	private Boolean temporalMutable;
-
-
-	// ********** constructors **********
-	public EclipseLinkOptions(PersistenceUnit parent) {
-		super(parent);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		// TOREVIEW - handle incorrect String in persistence.xml
-		this.sessionName = 
-			this.getStringValue(ECLIPSELINK_SESSION_NAME);
-		this.sessionsXml = 
-			this.getStringValue(ECLIPSELINK_SESSIONS_XML);
-		this.includeDescriptorQueries = 
-			this.getBooleanValue(ECLIPSELINK_SESSION_INCLUDE_DESCRIPTOR_QUERIES);
-		this.targetDatabase = this.getTargetDatabaseFromPersistenceXml();
-		this.targetServer = this.getTargetServerFromPersistenceXml();
-		this.eventListener = 
-			this.getStringValue(ECLIPSELINK_SESSION_EVENT_LISTENER);
-		this.temporalMutable = 
-			this.getBooleanValue(ECLIPSELINK_TEMPORAL_MUTABLE);
-	}
-	
-	protected String getTargetDatabaseFromPersistenceXml() {
-
-		String value = this.getStringValue(ECLIPSELINK_TARGET_DATABASE);
-		if (value == null) {
-			return null;
-		}
-		TargetDatabase standardTargetDatabase = this.getEnumValue(ECLIPSELINK_TARGET_DATABASE, TargetDatabase.values());
-		return (standardTargetDatabase == null) ? value : getPropertyStringValueOf(standardTargetDatabase);
-	}
-	
-	protected String getTargetServerFromPersistenceXml() {
-
-		String value = this.getStringValue(ECLIPSELINK_TARGET_SERVER);
-		if (value == null) {
-			return null;
-		}
-		TargetServer standardTargetServer = this.getEnumValue(ECLIPSELINK_TARGET_SERVER, TargetServer.values());
-		return (standardTargetServer == null) ? value : getPropertyStringValueOf(standardTargetServer);
-	}
-
-	// ********** behavior **********
-	
-	public void propertyValueChanged(String propertyName, String newValue) {
-		if (propertyName.equals(ECLIPSELINK_SESSION_NAME)) {
-			this.sessionNameChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSIONS_XML)) {
-			this.sessionsXmlChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TARGET_DATABASE)) {
-			this.targetDatabaseChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TARGET_SERVER)) {
-			this.targetServerChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSION_INCLUDE_DESCRIPTOR_QUERIES)) {
-			this.includeDescriptorQueriesChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSION_EVENT_LISTENER)) {
-			this.eventListenerChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TEMPORAL_MUTABLE)) {
-			this.temporalMutableChanged(newValue);
-		}	
-	}
-	
-	public void propertyRemoved(String propertyName) {
-		if (propertyName.equals(ECLIPSELINK_SESSION_NAME)) {
-			this.sessionNameChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSIONS_XML)) {
-			this.sessionsXmlChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TARGET_DATABASE)) {
-			this.targetDatabaseChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TARGET_SERVER)) {
-			this.targetServerChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSION_INCLUDE_DESCRIPTOR_QUERIES)) {
-			this.includeDescriptorQueriesChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SESSION_EVENT_LISTENER)) {
-			this.eventListenerChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TEMPORAL_MUTABLE)) {
-			this.temporalMutableChanged(null);
-		}	
-	}
-
-	/**
-	 * Adds property names key/value pairs, where: 
-	 * 		key = EclipseLink property key
-	 * 		value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		propertyNames.put(
-			ECLIPSELINK_SESSION_NAME,
-			SESSION_NAME_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_SESSIONS_XML,
-			SESSIONS_XML_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_SESSION_INCLUDE_DESCRIPTOR_QUERIES,
-			SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_TARGET_DATABASE,
-			TARGET_DATABASE_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_TARGET_SERVER,
-			TARGET_SERVER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_SESSION_EVENT_LISTENER,
-			SESSION_EVENT_LISTENER_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_TEMPORAL_MUTABLE,
-			TEMPORAL_MUTABLE_PROPERTY);
-	}
-
-
-	// ********** SessionName **********
-	public String getSessionName() {
-		return this.sessionName;
-	}
-
-	public void setSessionName(String newSessionName) {
-		String old = this.sessionName;
-		this.sessionName = newSessionName;
-		this.putProperty(SESSION_NAME_PROPERTY, newSessionName);
-		this.firePropertyChanged(SESSION_NAME_PROPERTY, old, newSessionName);
-	}
-
-	private void sessionNameChanged(String newValue) {
-		String old = this.sessionName;
-		this.sessionName = newValue;
-		this.firePropertyChanged(SESSION_NAME_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultSessionName() {
-		return DEFAULT_SESSION_NAME;
-	}
-
-	// ********** SessionsXml **********
-	public String getSessionsXml() {
-		return this.sessionsXml;
-	}
-
-	public void setSessionsXml(String newSessionsXml) {
-		String old = this.sessionsXml;
-		this.sessionsXml = newSessionsXml;
-		this.putProperty(SESSIONS_XML_PROPERTY, newSessionsXml);
-		this.firePropertyChanged(SESSIONS_XML_PROPERTY, old, newSessionsXml);
-	}
-
-	private void sessionsXmlChanged(String newValue) {
-		String old = this.sessionsXml;
-		this.sessionsXml = newValue;
-		this.firePropertyChanged(SESSIONS_XML_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultSessionsXml() {
-		return DEFAULT_SESSIONS_XML;
-	}
-
-	// ********** IncludeDescriptorQueries **********
-	public Boolean getIncludeDescriptorQueries() {
-		return this.includeDescriptorQueries;
-	}
-
-	public void setIncludeDescriptorQueries(Boolean newIncludeDescriptorQueries) {
-		Boolean old = this.includeDescriptorQueries;
-		this.includeDescriptorQueries = newIncludeDescriptorQueries;
-		this.putProperty(SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY, newIncludeDescriptorQueries);
-		this.firePropertyChanged(SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY, old, newIncludeDescriptorQueries);
-	}
-
-	private void includeDescriptorQueriesChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.includeDescriptorQueries;
-		this.includeDescriptorQueries = newValue;
-		this.firePropertyChanged(SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultIncludeDescriptorQueries() {
-		return DEFAULT_SESSION_INCLUDE_DESCRIPTOR_QUERIES;
-	}
-
-	// ********** TargetDatabase **********
-	/**
-	 * Returns TargetDatabase or custom targetDatabase class.
-	 * 
-	 * @return EclipseLink string value for TargetDatabase enum or custom targetDatabase class
-	 */
-	public String getTargetDatabase() {
-		return this.targetDatabase;
-	}
-
-	/**
-	 * Sets EclipseLink targetDatabase.
-	 * 
-	 * @param newTargetDatabase - TargetDatabase
-	 */
-	public void setTargetDatabase(TargetDatabase newTargetDatabase) {
-		if( newTargetDatabase == null) {
-			this.setTargetDatabase_((String) null);
-			return;
-		}
-		this.setTargetDatabase_(getPropertyStringValueOf(newTargetDatabase));
-	}
-
-	/**
-	 * Sets EclipseLink targetDatabase or custom targetDatabase.
-	 * 
-	 * @param newTargetDatabase -
-	 *            Can be a EclipseLink TargetDatabase literal or
-	 *            a fully qualified class name of a custom targetDatabase.
-	 */
-	public void setTargetDatabase(String newTargetDatabase) {
-		if( newTargetDatabase == null) {
-			this.setTargetDatabase_((String) null);
-			return;
-		}
-		TargetDatabase customTargetDatabase = TargetDatabase.getTargetDatabaseFor(newTargetDatabase);
-		if(customTargetDatabase == null) {	// custom TargetDatabase class
-			this.setTargetDatabase_(newTargetDatabase);
-		}
-		else {
-			this.setTargetDatabase(customTargetDatabase);
-		}
-	}
-	
-	private void setTargetDatabase_(String newTargetDatabase) {
-		String old = this.targetDatabase;
-		this.targetDatabase = newTargetDatabase;
-		this.putProperty(TARGET_DATABASE_PROPERTY, newTargetDatabase);
-		this.firePropertyChanged(TARGET_DATABASE_PROPERTY, old, newTargetDatabase);
-	}
-
-	private void targetDatabaseChanged(String newValue) {
-		String old = this.targetDatabase;
-		this.targetDatabase = newValue;
-		this.firePropertyChanged(TARGET_DATABASE_PROPERTY, old, newValue);
-	}
-	
-	public String getDefaultTargetDatabase() {
-		return DEFAULT_TARGET_DATABASE;
-	}
-
-	// ********** TargetServer **********
-	/**
-	 * Returns TargetServer or custom targetServer class.
-	 * 
-	 * @return EclipseLink string value for TargetServer enum or custom targetServer class
-	 */
-	public String getTargetServer() {
-		return this.targetServer;
-	}
-
-	/**
-	 * Sets EclipseLink targetServer.
-	 * 
-	 * @param newTargetServer - TargetServer
-	 */
-	public void setTargetServer(TargetServer newTargetServer) {
-		if( newTargetServer == null) {
-			this.setTargetServer_((String) null);
-			return;
-		}
-		this.setTargetServer_(getPropertyStringValueOf(newTargetServer));
-	}
-
-	/**
-	 * Sets EclipseLink targetServer or custom targetServer.
-	 * 
-	 * @param newTargetServer -
-	 *            Can be a EclipseLink TargetServer literal or
-	 *            a fully qualified class name of a custom targetServer.
-	 */
-	public void setTargetServer(String newTargetServer) {
-		if( newTargetServer == null) {
-			this.setTargetServer_((String) null);
-			return;
-		}
-		TargetServer customTargetServer = TargetServer.getTargetServerFor(newTargetServer);
-		if(customTargetServer == null) {	// custom TargetServer class
-			this.setTargetServer_(newTargetServer);
-		}
-		else {
-			this.setTargetServer(customTargetServer);
-		}
-	}
-	
-	private void setTargetServer_(String newTargetServer) {
-		String old = this.targetServer;
-		this.targetServer = newTargetServer;
-		this.putProperty(TARGET_SERVER_PROPERTY, newTargetServer);
-		this.firePropertyChanged(TARGET_SERVER_PROPERTY, old, newTargetServer);
-	}
-
-	private void targetServerChanged(String newValue) {
-		String old = this.targetServer;
-		this.targetServer = newValue;
-		this.firePropertyChanged(TARGET_SERVER_PROPERTY, old, newValue);
-	}
-	
-	public String getDefaultTargetServer() {
-		return DEFAULT_TARGET_SERVER;
-	}
-
-	// ********** EventListener **********
-	public String getEventListener() {
-		return this.eventListener;
-	}
-
-	public void setEventListener(String newEventListener) {
-		String old = this.eventListener;
-		this.eventListener = newEventListener;
-		this.putProperty(SESSION_EVENT_LISTENER_PROPERTY, newEventListener);
-		this.firePropertyChanged(SESSION_EVENT_LISTENER_PROPERTY, old, newEventListener);
-	}
-
-	private void eventListenerChanged(String newValue) {
-		String old = this.eventListener;
-		this.eventListener = newValue;
-		this.firePropertyChanged(SESSION_EVENT_LISTENER_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultEventListener() {
-		return DEFAULT_SESSION_EVENT_LISTENER;
-	}
-	
-	// ********** TemporalMutable **********
-
-	public Boolean getTemporalMutable() {
-		return this.temporalMutable;
-	}
-
-	public void setTemporalMutable(Boolean newTemporalMutable) {
-		Boolean old = this.temporalMutable;
-		this.temporalMutable = newTemporalMutable;
-		this.putProperty(TEMPORAL_MUTABLE_PROPERTY, newTemporalMutable);
-		this.firePropertyChanged(TEMPORAL_MUTABLE_PROPERTY, old, newTemporalMutable);
-	}
-
-	private void temporalMutableChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.temporalMutable;
-		this.temporalMutable = newValue;
-		this.firePropertyChanged(TEMPORAL_MUTABLE_PROPERTY, old, newValue);
-	}
-	
-	public Boolean getDefaultTemporalMutable() {
-		return DEFAULT_TEMPORAL_MUTABLE;
-	}
-
-
-	// ********** refactoring ************
-
-	@Override
-	public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
-		return this.createEventListenerRenameTypeEdits(originalType, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createEventListenerRenameTypeEdits(IType originalType, String newName) {
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_SESSION_EVENT_LISTENER);
-		if (property != null) {
-			return property.createRenameTypeEdits(originalType, newName);
-		}
-		return EmptyIterable.instance();
-	}
-
-	@Override
-	public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		return this.createEventListenerMoveTypeEdits(originalType, newPackage);
-	}
-
-	protected Iterable<ReplaceEdit> createEventListenerMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_SESSION_EVENT_LISTENER);
-		if (property != null) {
-			return property.createMoveTypeEdits(originalType, newPackage);
-		}
-		return EmptyIterable.instance();
-	}
-
-	@Override
-	public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		return this.createEventListenerRenamePackageEdits(originalPackage, newName);
-	}
-
-	protected Iterable<ReplaceEdit> createEventListenerRenamePackageEdits(IPackageFragment originalPackage, String newName) {
-		PersistenceUnit.Property property = getPersistenceUnit().getProperty(ECLIPSELINK_SESSION_EVENT_LISTENER);
-		if (property != null) {
-			return property.createRenamePackageEdits(originalPackage, newName);
-		}
-		return EmptyIterable.instance();
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/schema/generation/EclipseLinkSchemaGeneration.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/schema/generation/EclipseLinkSchemaGeneration.java
deleted file mode 100644
index 671baa4fd6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/schema/generation/EclipseLinkSchemaGeneration.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.schema.generation;
-
-import java.util.Map;
-import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.DdlGenerationType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.OutputMode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.SchemaGeneration;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnitProperties;
-
-/**
- * EclipseLinkSchemaGeneration encapsulates EclipseLink SchemaGeneration
- * properties.
- */
-public class EclipseLinkSchemaGeneration
-	extends EclipseLinkPersistenceUnitProperties implements SchemaGeneration
-{
-	// ********** EclipseLink properties **********
-	
-	private OutputMode outputMode;
-	private DdlGenerationType ddlGenerationType;
-	private String createFileName;
-	private String dropFileName;
-	private String applicationLocation;
-
-	// ********** constructors/initialization **********
-	
-	public EclipseLinkSchemaGeneration(PersistenceUnit parent) {
-		super(parent);
-	}
-
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		this.outputMode = 
-			this.getEnumValue(ECLIPSELINK_DDL_GENERATION_OUTPUT_MODE, OutputMode.values());
-		this.ddlGenerationType = 
-			this.getEnumValue(ECLIPSELINK_DDL_GENERATION_TYPE, DdlGenerationType.values());
-		this.createFileName = 
-			this.getStringValue(ECLIPSELINK_CREATE_FILE_NAME);
-		this.dropFileName = 
-			this.getStringValue(ECLIPSELINK_DROP_FILE_NAME);
-		this.applicationLocation = 
-			this.getStringValue(ECLIPSELINK_APPLICATION_LOCATION);
-	}
-
-	/**
-	 * Adds property names key/value pairs, where: key = EclipseLink property
-	 * key; value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		propertyNames.put(
-			ECLIPSELINK_DDL_GENERATION_OUTPUT_MODE,
-			OUTPUT_MODE_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_DDL_GENERATION_TYPE,
-			DDL_GENERATION_TYPE_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_CREATE_FILE_NAME,
-			CREATE_FILE_NAME_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_DROP_FILE_NAME,
-			DROP_FILE_NAME_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_APPLICATION_LOCATION,
-			APPLICATION_LOCATION_PROPERTY);
-	}
-
-	// ********** behavior **********
-	
-	public void propertyValueChanged(String propertyName, String newValue) {
-		if (propertyName.equals(ECLIPSELINK_DDL_GENERATION_OUTPUT_MODE)) {
-			this.outputModeChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_DDL_GENERATION_TYPE)) {
-			this.ddlGenerationTypeChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CREATE_FILE_NAME)) {
-			this.createFileNameChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_DROP_FILE_NAME)) {
-			this.dropFileNameChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_APPLICATION_LOCATION)) {
-			this.applicationLocationChanged(newValue);
-		}
-	}
-	
-	public void propertyRemoved(String propertyName) {
-		if (propertyName.equals(ECLIPSELINK_DDL_GENERATION_OUTPUT_MODE)) {
-			this.outputModeChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_DDL_GENERATION_TYPE)) {
-			this.ddlGenerationTypeChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CREATE_FILE_NAME)) {
-			this.createFileNameChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_DROP_FILE_NAME)) {
-			this.dropFileNameChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_APPLICATION_LOCATION)) {
-			this.applicationLocationChanged(null);
-		}
-	}
-
-	// ********** DdlGenerationType **********
-	public DdlGenerationType getDdlGenerationType() {
-		return this.ddlGenerationType;
-	}
-
-	public void setDdlGenerationType(DdlGenerationType newDdlGenType) {
-		DdlGenerationType old = this.ddlGenerationType;
-		this.ddlGenerationType = newDdlGenType;
-		this.putProperty(DDL_GENERATION_TYPE_PROPERTY, newDdlGenType);
-		this.firePropertyChanged(DDL_GENERATION_TYPE_PROPERTY, old, newDdlGenType);
-	}
-
-	private void ddlGenerationTypeChanged(String stringValue) {
-		DdlGenerationType newValue = getEnumValueOf(stringValue, DdlGenerationType.values());
-		DdlGenerationType old = this.ddlGenerationType;
-		this.ddlGenerationType = newValue;
-		this.firePropertyChanged(DDL_GENERATION_TYPE_PROPERTY, old, newValue);
-	}
-
-	public DdlGenerationType getDefaultDdlGenerationType() {
-		return DEFAULT_SCHEMA_GENERATION_DDL_GENERATION_TYPE;
-	}
-
-	// ********** OutputMode **********
-	public OutputMode getOutputMode() {
-		return this.outputMode;
-	}
-
-	public void setOutputMode(OutputMode newOutputMode) {
-		OutputMode old = this.outputMode;
-		this.outputMode = newOutputMode;
-		this.putProperty(OUTPUT_MODE_PROPERTY, newOutputMode);
-		this.firePropertyChanged(OUTPUT_MODE_PROPERTY, old, newOutputMode);
-	}
-
-	private void outputModeChanged(String stringValue) {
-		OutputMode newValue = getEnumValueOf(stringValue, OutputMode.values());
-		OutputMode old = this.outputMode;
-		this.outputMode = newValue;
-		this.firePropertyChanged(OUTPUT_MODE_PROPERTY, old, newValue);
-	}
-
-	public OutputMode getDefaultOutputMode() {
-		return DEFAULT_SCHEMA_GENERATION_OUTPUT_MODE;
-	}
-
-	// ********** CreateFileName **********
-	public String getCreateFileName() {
-		return this.createFileName;
-	}
-
-	public void setCreateFileName(String newCreateFileName) {
-		String old = this.createFileName;
-		this.createFileName = newCreateFileName;
-		this.putProperty(CREATE_FILE_NAME_PROPERTY, newCreateFileName);
-		this.firePropertyChanged(CREATE_FILE_NAME_PROPERTY, old, newCreateFileName);
-	}
-
-	private void createFileNameChanged(String newValue) {
-		String old = this.createFileName;
-		this.createFileName = newValue;
-		this.firePropertyChanged(CREATE_FILE_NAME_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultCreateFileName() {
-		return DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME;
-	}
-
-	// ********** dropFileName **********
-	public String getDropFileName() {
-		return this.dropFileName;
-	}
-
-	public void setDropFileName(String newDropFileName) {
-		String old = this.dropFileName;
-		this.dropFileName = newDropFileName;
-		this.putProperty(DROP_FILE_NAME_PROPERTY, newDropFileName);
-		this.firePropertyChanged(DROP_FILE_NAME_PROPERTY, old, newDropFileName);
-	}
-
-	private void dropFileNameChanged(String newValue) {
-		String old = this.dropFileName;
-		this.dropFileName = newValue;
-		this.firePropertyChanged(DROP_FILE_NAME_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultDropFileName() {
-		return DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME;
-	}
-
-	// ********** applicationLocation **********
-	public String getApplicationLocation() {
-		return this.applicationLocation;
-	}
-
-	public void setApplicationLocation(String newApplicationLocation) {
-		String old = this.applicationLocation;
-		this.applicationLocation = (StringTools.stringIsNotEmpty(newApplicationLocation)) ? 
-												newApplicationLocation : 
-												this.getDefaultApplicationLocation();
-		this.putProperty(APPLICATION_LOCATION_PROPERTY, this.applicationLocation);
-		this.firePropertyChanged(APPLICATION_LOCATION_PROPERTY, old, this.applicationLocation);
-	}
-
-	private void applicationLocationChanged(String newValue) {
-		String old = this.applicationLocation;
-		this.applicationLocation = newValue;
-		this.firePropertyChanged(APPLICATION_LOCATION_PROPERTY, old, newValue);
-	}
-
-	public String getDefaultApplicationLocation() {
-		return DEFAULT_SCHEMA_GENERATION_APPLICATION_LOCATION;
-	}
-}
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
deleted file mode 100644
index 7ba94b5af3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/AbstractEclipseLinkDDLGenerator.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.ddlgen;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-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.utility.internal.ReflectionTools;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.internal.JptCoreMessages;
-import org.eclipse.jpt.jpa.db.ConnectionProfile;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection.Connection;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Customization;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.Logging;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.LoggingLevel;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.DdlGenerationType;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.OutputMode;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.SchemaGeneration;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-public abstract class AbstractEclipseLinkDDLGenerator extends AbstractJptGenerator
-{
-	public static final String LAUNCH_CONFIG_NAME = "Dali EclipseLink Table Generation";   //$NON-NLS-1$
-	public static final String DDL_GEN_PACKAGE_NAME = "org.eclipse.jpt.jpa.eclipselink.core.ddlgen";   //$NON-NLS-1$
-	public static final String ECLIPSELINK_DDL_GEN_CLASS = DDL_GEN_PACKAGE_NAME + ".Main";	  //$NON-NLS-1$
-	public static final String ECLIPSELINK_DDL_GEN_JAR_PREFIX = DDL_GEN_PACKAGE_NAME + "_";	//$NON-NLS-1$
-	public static final String BUNDLE_CLASSPATH = "Bundle-ClassPath";	  //$NON-NLS-1$
-	public static final String PROPERTIES_FILE_NAME = "login.properties";	  //$NON-NLS-1$
-	public static final String TRUE = "true";	  //$NON-NLS-1$
-	public static final String FALSE = "false";	  //$NON-NLS-1$
-	public static final String NONE = "NONE";	  //$NON-NLS-1$
-
-	private final String puName;
-	private final JpaProject jpaProject;
-	private final OutputMode outputMode;
-
-	// ********** constructors **********
-
-	protected AbstractEclipseLinkDDLGenerator(String puName, JpaProject jpaProject, OutputMode outputMode) {
-		super(JavaCore.create(jpaProject.getProject()));
-		this.puName = puName;
-		this.jpaProject = jpaProject;
-		this.outputMode = outputMode;
-	}
-
-	// ********** overrides **********
-
-	@Override
-	protected String getLaunchConfigName() {
-		return LAUNCH_CONFIG_NAME;
-	}
-
-	@Override
-	protected String getMainType() {
-		return ECLIPSELINK_DDL_GEN_CLASS;
-	}
-
-	@Override
-	protected String getBootstrapJarPrefix() {
-		return ECLIPSELINK_DDL_GEN_JAR_PREFIX;
-	}
-	
-	@Override
-	protected void preGenerate(IProgressMonitor monitor) {
-		SubMonitor sm = SubMonitor.convert(monitor, 2);
-		//disconnect since the runtime provider will need to connect to generate the tables
-		ConnectionProfile cp = this.getConnectionProfile();
-		if (cp != null) {
-			cp.disconnect();
-			sm.worked(1);
-		}
-		sm.setWorkRemaining(1);
-		this.saveLoginProperties();
-		sm.worked(1);
-	}
-	
-	@Override
-	protected void postGenerate() {
-		super.postGenerate();
-		this.reconnect();
-		this.validateProject();
-	}
-
-	// ********** Setting Launch Configuration **********
-	
-	@Override
-	protected void specifyProgramArguments() {
-		StringBuffer programArguments = new StringBuffer();
-		this.appendPuNameArgument(programArguments);
-		this.appendPropertiesFileArgument(programArguments);
-		this.appendDebugArgument(programArguments);
-		
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, programArguments.toString());
-	}
-
-	@Override
-	protected List<String> buildClasspath() throws CoreException {
-		List<String> classpath = new ArrayList<String>();
-		// DDL_GEN jar
-		classpath.add(getBootstrapJarClasspathEntry().getMemento());
-		// Default Project classpath
-		classpath.add(this.getDefaultProjectClasspathEntry().getMemento());
-		// Osgi Bundles
-		classpath.addAll(this.getPersistenceOsgiBundlesMemento());
-		// JDBC jar
-		classpath.add(this.getJdbcJarClasspathEntry().getMemento());
-		// System Library  
-		classpath.add(this.getSystemLibraryClasspathEntry().getMemento());
-		return classpath;
-	}
-
-	// ********** behavior **********
-
-	//reconnect since we disconnected in preGenerate();
-	//ensure the project is fully updated before validating - bug 277236
-	protected void reconnect() {
-		getJpaProject().updateAndWait();
-		ConnectionProfile cp = this.getConnectionProfile();
-		if (cp != null) {
-			cp.connect();
-		}
-	}
-
-	protected void validateProject() {
-		IProject project = this.getJpaProject().getProject();
-		ValidateJob job = new ValidateJob(project);
-		job.setRule(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(project));
-		job.schedule();
-	}
-
-	// ********** ClasspathEntry **********
-
-	private IRuntimeClasspathEntry getJdbcJarClasspathEntry() {
-		return getArchiveClasspathEntry(this.buildJdbcJarPath());
-	}
-	
-	private IRuntimeClasspathEntry getBundleClasspathEntry(String bundleId) {
-		IPath persistClasspath = this.getBundleClasspath(bundleId);
-		IRuntimeClasspathEntry bundleEntry = getArchiveClasspathEntry(persistClasspath);
-		
-		return bundleEntry;
-	}
-
-
-	// ********** EclipseLink properties **********
-	
-	protected void buildConnectionProperties(Properties properties) {
-		this.putProperty(properties,  
-			Connection.ECLIPSELINK_BIND_PARAMETERS,
-			FALSE);
-	}
-	
-	private void buildLoggingProperties(Properties properties) {
-		this.putProperty(properties,
-			Logging.ECLIPSELINK_LEVEL,
-			LoggingLevel.FINE);
-		this.putProperty(properties,
-			Logging.ECLIPSELINK_TIMESTAMP,
-			FALSE);
-		this.putProperty(properties,
-			Logging.ECLIPSELINK_THREAD,
-			FALSE);
-		this.putProperty(properties,
-			Logging.ECLIPSELINK_SESSION,
-			FALSE);
-		this.putProperty(properties,
-			Logging.ECLIPSELINK_EXCEPTIONS,
-			TRUE);
-	}
-	
-	protected void buildCustomizationProperties(Properties properties) {
-		this.putProperty(properties,
-			Customization.ECLIPSELINK_THROW_EXCEPTIONS,
-			TRUE);
-	}
-	
-	protected void putProperty(Properties properties, String key, String value) {
-		properties.put(key, (value == null) ? "" : value);	  //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the Property string value of the given property value.
-	 */
-	protected String getPropertyStringValueOf(Object value) {
-		if (value == null) {
-			return null;
-		}
-		if (value.getClass().isEnum()) {
-			return (String) ReflectionTools.getStaticFieldValue(value.getClass(), value.toString().toUpperCase(Locale.ENGLISH));
-		}
-		return value.toString();
-	}
-	
-	protected void buildAllProperties(Properties properties) {
-		this.buildConnectionProperties(properties);
-		this.buildConnectionPoolingProperties(properties);
-		this.buildLoggingProperties(properties);
-		this.buildCustomizationProperties(properties);
-		this.buildDDLModeProperties(properties);
-		this.buildProjectLocationProperty(properties);
-	}
-
-	// ********** private methods **********
-	
-	private void buildProjectLocationProperty(Properties properties) {
-		this.putProperty(properties, 
-			SchemaGeneration.ECLIPSELINK_APPLICATION_LOCATION,
-			this.projectLocation);
-	}
-	
-	private void buildDDLModeProperties(Properties properties) {
-		this.putProperty(properties,  
-			SchemaGeneration.ECLIPSELINK_DDL_GENERATION_OUTPUT_MODE,
-			this.getPropertyStringValueOf(this.outputMode));
-		
-		this.putProperty(properties,  
-			SchemaGeneration.ECLIPSELINK_DDL_GENERATION_TYPE,
-			DdlGenerationType.DROP_AND_CREATE_TABLES);
-
-		this.putProperty(properties,  
-			SchemaGeneration.ECLIPSELINK_CREATE_FILE_NAME,
-			SchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME);
-		this.putProperty(properties,  
-			SchemaGeneration.ECLIPSELINK_DROP_FILE_NAME,
-			SchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME);
-	}
-	
-	private void buildConnectionPoolingProperties(Properties properties) {
-		this.putProperty(properties,
-			Connection.ECLIPSELINK_READ_CONNECTIONS_SHARED,
-			TRUE);
-	}
-	
-	private void saveLoginProperties() {
-		String propertiesFile  = this.projectLocation + "/" + PROPERTIES_FILE_NAME; 	  //$NON-NLS-1$
-
-		Properties elProperties = new Properties();
-
-		this.buildAllProperties(elProperties);
-		FileOutputStream stream = null;
-	    try {
-	        File file = new File(propertiesFile);
-			if (!file.exists() && ! file.createNewFile()) {
-				throw new RuntimeException("createNewFile() failed: " + file); //$NON-NLS-1$
-			}
-	        stream = new FileOutputStream(file);
-	        elProperties.store(stream, null);
-	    }
-	    catch (Exception e) {
-	    	String message = "Error saving: " + propertiesFile; //$NON-NLS-1$
-			throw new RuntimeException(message, e);
-		}
-	    finally {
-	    	this.closeStream(stream);
-	    }
-	}
-	
-	private void closeStream(OutputStream stream) {
-    	if (stream != null) {
-    		try {
-				stream.close();
-			}
-			catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-    	}		
-	}
-
-	/**
-	 * Performs validation after tables have been generated
-	 */
-	private class ValidateJob extends Job 
-	{	
-		private IProject project;
-		
-		
-		public ValidateJob(IProject project) {
-			super(JptCoreMessages.VALIDATE_JOB);
-			this.project = project;
-		}
-		
-		
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			IStatus status = Status.OK_STATUS;
-			try {
-				ValidationFramework.getDefault().validate(
-					new IProject[] {this.project}, true, false, monitor);
-			}
-			catch (CoreException ce) {
-				status = Status.CANCEL_STATUS;
-			}
-			return status;
-		}
-	}
-	
-	private IPath buildJdbcJarPath() {
-		return new Path(this.getJpaProjectConnectionDriverJarList());
-	}
-	
-	private String getJpaProjectConnectionDriverJarList() {
-		ConnectionProfile cp = this.getConnectionProfile();
-		return (cp == null) ? "" : cp.getDriverJarList(); //$NON-NLS-1$
-	}
-
-	// ********** Main arguments **********
-
-	private void appendPuNameArgument(StringBuffer sb) {
-		sb.append(" -pu \""); //$NON-NLS-1$
-		sb.append(this.puName);
-		sb.append("\"");	  //$NON-NLS-1$
-	}
-	
-	private void appendPropertiesFileArgument(StringBuffer sb) {
-		sb.append(" -p \""); //$NON-NLS-1$
-		sb.append(this.projectLocation).append("/").append(PROPERTIES_FILE_NAME).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-
-	// ********** Queries **********
-	
-	protected JpaPlatform getPlatform() {
-		return this.getJpaProject().getJpaPlatform();
-	}
-	
-	protected JpaProject getJpaProject() {
-		return this.jpaProject;
-	}
-	
-	
-	protected ConnectionProfile getConnectionProfile() {
-		return this.getJpaProject().getConnectionProfile();
-	}
-	
-
-	// ********** Bundles *********
-
-	private Collection<String> getPersistenceOsgiBundlesMemento() throws CoreException {
-
-		Collection<String> result = new HashSet<String>();
-		if (javaxPersistenceBundleExists()) {
-			result.add(this.getBundleClasspathEntry(JAVAX_PERSISTENCE_BUNDLE).getMemento());
-			result.add(this.getBundleClasspathEntry(ORG_ECLIPSE_PERSISTENCE_CORE_BUNDLE).getMemento());
-			result.add(this.getBundleClasspathEntry(ORG_ECLIPSE_PERSISTENCE_ASM_BUNDLE).getMemento());
-			result.add(this.getBundleClasspathEntry(ORG_ECLIPSE_PERSISTENCE_ANTLR_BUNDLE).getMemento());
-			result.add(this.getBundleClasspathEntry(ORG_ECLIPSE_PERSISTENCE_JPA_BUNDLE).getMemento());
-		}
-		return result;
-	}
-	
-	private IPath getBundleClasspath(String pluginID) {
-		Bundle bundle = Platform.getBundle(pluginID);
-		if (bundle == null) {
-			throw new RuntimeException(pluginID + " cannot be retrieved from the Platform"); //$NON-NLS-1$
-		}
-		return this.getClassPath(bundle);
-	}
-
-	private IPath getClassPath(Bundle bundle) {
-		String path = bundle.getHeaders().get(BUNDLE_CLASSPATH);
-		if (path == null) {
-			path = ".";	  //$NON-NLS-1$
-		}
-		ManifestElement[] elements = null;
-		try {
-			elements = ManifestElement.parseHeader(BUNDLE_CLASSPATH, path);
-		}
-		catch (BundleException e) {
-			throw new RuntimeException("Error parsing bundle header: " + bundle, e); //$NON-NLS-1$
-		}
-		if (elements != null) {
-			for (int i = 0; i < elements.length; ++i) {
-				ManifestElement element = elements[i];
-				String value = element.getValue();
-				if (".".equals(value)) {	  //$NON-NLS-1$
-					value = "/";		//$NON-NLS-1$
-				}
-				URL url = bundle.getEntry(value);
-				if (url != null) {
-					try {
-						URL resolvedURL = FileLocator.resolve(url);
-						String filestring = FileLocator.toFileURL(resolvedURL).getFile();
-		                if (filestring.startsWith("file:")) {	//$NON-NLS-1$
-		                	filestring = filestring.substring(filestring.indexOf(':') + 1);
-		                }
-		                if (filestring.endsWith("!/")) {		//$NON-NLS-1$
-		                	filestring = filestring.substring(0, filestring.lastIndexOf('!'));
-		                }
-						File file = new File(filestring);
-						String filePath = file.getCanonicalPath();
-						return new Path(filePath);
-					}
-					catch (IOException e) {
-						throw new RuntimeException("Error locating bundle: " + bundle, e); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	private boolean javaxPersistenceBundleExists() {
-		return Platform.getBundle(JAVAX_PERSISTENCE_BUNDLE) != null;
-	}
-
-	// ********** constants **********
-
-	private static final String JAVAX_PERSISTENCE_BUNDLE = "javax.persistence";					//$NON-NLS-1$
-	private static final String ORG_ECLIPSE_PERSISTENCE_CORE_BUNDLE = "org.eclipse.persistence.core";	//$NON-NLS-1$
-	private static final String ORG_ECLIPSE_PERSISTENCE_ASM_BUNDLE = "org.eclipse.persistence.asm";	//$NON-NLS-1$
-	private static final String ORG_ECLIPSE_PERSISTENCE_ANTLR_BUNDLE = "org.eclipse.persistence.antlr";	//$NON-NLS-1$
-	private static final String ORG_ECLIPSE_PERSISTENCE_JPA_BUNDLE = "org.eclipse.persistence.jpa";	//$NON-NLS-1$
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java
deleted file mode 100644
index f3b7f8543a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/EclipseLinkDDLGenerator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2008, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.ddlgen;
-
-import java.util.Properties;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.db.ConnectionProfile;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection.Connection;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.OutputMode;
-
-/**
- *  EclipseLinkDLLGenerator launches the EclipseLink DDL generator in a separate VM.
- *  For this it will create a Java Configuration named "Dali EclipseLink Table Generation" 
- *  in the target workspace (note: the configuration will be overridden at each run).
- *  It will than launch the configuration created with the login information from 
- *  the current Dali project, and passes it to EclipseLink.
- *  
- *  Pre-req in PDE environment:
- *  	org.eclipse.jpt.jpa.eclipselink.core.ddlgen.jar in ECLIPSE_HOME/plugins
- */
-public class EclipseLinkDDLGenerator extends AbstractEclipseLinkDDLGenerator
-{
-
-	// ********** constructors **********
-	
-	public static void generate(String puName, JpaProject project, OutputMode outputMode, IProgressMonitor monitor) {
-		if (puName == null || puName.length() == 0 || project == null) {
-			throw new NullPointerException();
-		}
-		new EclipseLinkDDLGenerator(puName, project, outputMode).generate(monitor);
-	}
-
-	private EclipseLinkDDLGenerator(String puName, JpaProject jpaProject, OutputMode outputMode) {
-		super(puName, jpaProject, outputMode);
-	}
-
-	@Override
-	protected void buildConnectionProperties(Properties properties) {
-		super.buildConnectionProperties(properties);
-		ConnectionProfile cp = this.getConnectionProfile();
-
-		this.putProperty(properties, 
-			Connection.ECLIPSELINK_DRIVER,
-			(cp == null) ? "" : cp.getDriverClassName()); //$NON-NLS-1$
-		this.putProperty(properties,
-			Connection.ECLIPSELINK_URL,
-			(cp == null) ? "" : cp.getURL()); //$NON-NLS-1$
-		this.putProperty(properties,
-			Connection.ECLIPSELINK_USER,
-			(cp == null) ? "" : cp.getUserName()); //$NON-NLS-1$
-		this.putProperty(properties,
-			Connection.ECLIPSELINK_PASSWORD,
-			(cp == null) ? "" : cp.getUserPassword()); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/libval/EclipseLinkEclipseLinkBundlesLibraryValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/libval/EclipseLinkEclipseLinkBundlesLibraryValidator.java
deleted file mode 100644
index 961014038a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/libval/EclipseLinkEclipseLinkBundlesLibraryValidator.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.libval;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jpt.common.core.libprov.JptLibraryProviderInstallOperationConfig;
-import org.eclipse.jpt.jpa.core.internal.libprov.JpaOsgiBundlesLibraryProviderInstallOperationConfig;
-import org.eclipse.jpt.jpa.core.internal.libval.AbstractOsgiBundlesLibraryValidator;
-import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
-import org.eclipse.jpt.jpa.eclipselink.core.platform.EclipseLinkPlatform;
-import org.eclipse.osgi.service.resolver.VersionRange;
-
-public class EclipseLinkEclipseLinkBundlesLibraryValidator
-	extends AbstractOsgiBundlesLibraryValidator {
-	
-	public IStatus validate(JptLibraryProviderInstallOperationConfig config) {
-		JpaOsgiBundlesLibraryProviderInstallOperationConfig jpaConfig 
-				= (JpaOsgiBundlesLibraryProviderInstallOperationConfig) config;
-		Map<String, VersionRange[]> bundleVersionRanges = new HashMap<String, VersionRange[]>();
-		JpaPlatformDescription platform = jpaConfig.getJpaPlatform();
-		if (EclipseLinkPlatform.VERSION_1_0.equals(platform)) {
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.core", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.0, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.jpa", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.0, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.asm", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.0, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.antlr", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.0, 3.0)")}); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_1_1.equals(platform)) {
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.core", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.1, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.jpa", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.1, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.asm", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.1, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.antlr", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.1, 3.0)")}); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_1_2.equals(platform)) {
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.core", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.2, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.jpa", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.2, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.asm", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.2, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.antlr", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[1.2, 3.0)")}); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_2_0.equals(platform)) {
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.core", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.0, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.jpa", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.0, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.asm", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.0, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.antlr", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.0, 3.0)")}); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_2_1.equals(platform)) {
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.core", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.1, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.jpa", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.1, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.asm", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.1, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.antlr", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.1, 3.0)")}); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_2_2.equals(platform)) {
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.core", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.2, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.jpa", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.2, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.asm", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.2, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.antlr", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.2, 3.0)")}); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_2_3.equals(platform)) {
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.core", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.3, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.jpa", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.3, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.asm", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.3, 3.0)")}); //$NON-NLS-1$
-			bundleVersionRanges.put(
-					"org.eclipse.persistence.antlr", //$NON-NLS-1$
-					new VersionRange[] {new VersionRange("[2.3, 3.0)")}); //$NON-NLS-1$
-		}
-		
-		return validate(jpaConfig, bundleVersionRanges);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/libval/EclipseLinkUserLibraryValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/libval/EclipseLinkUserLibraryValidator.java
deleted file mode 100644
index c7873854d4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/libval/EclipseLinkUserLibraryValidator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.libval;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jpt.common.core.libprov.JptLibraryProviderInstallOperationConfig;
-import org.eclipse.jpt.common.core.libval.LibraryValidator;
-import org.eclipse.jpt.common.eclipselink.core.internal.libval.EclipseLinkLibValUtil;
-import org.eclipse.jpt.jpa.core.internal.libprov.JpaUserLibraryProviderInstallOperationConfig;
-import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
-import org.eclipse.jpt.jpa.eclipselink.core.platform.EclipseLinkPlatform;
-import org.eclipse.osgi.service.resolver.VersionRange;
-
-/**
- * Library validator for EclipseLink user libraries.
- * 
- * In order to validate that the correct eclipselink.jar is present in the user library, the version
- * class which appears in standard EclipseLink libraries will be examined and compared against the
- * union of calculated version ranges, depending on the platform specified in the config.
- */
-public class EclipseLinkUserLibraryValidator
-		implements LibraryValidator {
-	
-	public IStatus validate(JptLibraryProviderInstallOperationConfig config) {
-		JpaUserLibraryProviderInstallOperationConfig jpaConfig 
-				= (JpaUserLibraryProviderInstallOperationConfig) config;
-		JpaPlatformDescription platform = jpaConfig.getJpaPlatform();
-		Set<VersionRange> versionRanges = new HashSet<VersionRange>();
-		
-		if (EclipseLinkPlatform.VERSION_1_0.equals(platform)) {
-			versionRanges.add(new VersionRange("[1.0, 3.0)")); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_1_1.equals(platform)) {
-			versionRanges.add(new VersionRange("[1.1, 3.0)")); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_1_2.equals(platform)) {
-			versionRanges.add(new VersionRange("[1.2, 3.0)")); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_2_0.equals(platform)) {
-			versionRanges.add(new VersionRange("[2.0, 3.0)")); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_2_1.equals(platform)) {
-			versionRanges.add(new VersionRange("[2.1, 3.0)")); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_2_2.equals(platform)) {
-			versionRanges.add(new VersionRange("[2.2, 3.0)")); //$NON-NLS-1$
-		}
-		else if (EclipseLinkPlatform.VERSION_2_3.equals(platform)) {
-			versionRanges.add(new VersionRange("[2.3, 3.0)")); //$NON-NLS-1$
-		}
-		
-		return EclipseLinkLibValUtil.validate(jpaConfig.resolve(), versionRanges);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java
deleted file mode 100644
index b33cc33ee5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008, 2010 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.operations;
-
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProvider;
-import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.platform.EclipseLinkPlatform;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_2.EclipseLink1_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class EclipseLinkOrmFileCreationDataModelProvider
-	extends OrmFileCreationDataModelProvider
-{
-	/**
-	 * required default constructor
-	 */
-	public EclipseLinkOrmFileCreationDataModelProvider() {
-		super();
-	}
-	
-	
-	@Override
-	public IDataModelOperation getDefaultOperation() {
-		return new EclipseLinkOrmFileCreationOperation(getDataModel());
-	}
-	
-	@Override
-	protected String getDefaultFileName() {
-		return JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH.lastSegment();
-	}
-	
-	@Override
-	protected String getDefaultVersion() {
-		if (getProject() == null) {
-			return null;
-		}
-		try {
-			return getJpaProject().getJpaPlatform().getMostRecentSupportedResourceType(
-					JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE).getVersion();
-		}
-		catch (IllegalArgumentException iae) {
-			// eclipselink content not supported for project
-			return null;
-		}
-	}
-	
-	@Override
-	protected boolean fileVersionSupported(String fileVersion) {
-		return fileVersion.equals(EclipseLink.SCHEMA_VERSION)
-				|| fileVersion.equals(EclipseLink1_1.SCHEMA_VERSION)
-				|| fileVersion.equals(EclipseLink1_2.SCHEMA_VERSION)
-				|| fileVersion.equals(EclipseLink2_0.SCHEMA_VERSION)
-				|| fileVersion.equals(EclipseLink2_1.SCHEMA_VERSION)
-				|| fileVersion.equals(EclipseLink2_2.SCHEMA_VERSION)
-				|| fileVersion.equals(EclipseLink2_3.SCHEMA_VERSION);
-	}
-	
-	@Override
-	protected boolean fileVersionSupportedForFacetVersion(String fileVersion, String jpaFacetVersion) {
-		// assume that platform has been policed for facet version already
-		return true;
-	}
-	
-	@Override
-	protected boolean isSupportedPlatformId(String id) {
-		JpaPlatformDescription platform = JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatform(id);
-		if (platform == null) {
-			return false;
-		}
-		return EclipseLinkPlatform.GROUP.equals(platform.getGroup());
-	}
-}
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
deleted file mode 100644
index 06573a32b5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationOperation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.operations;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationOperation;
-import org.eclipse.jpt.jpa.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EclipseLinkOrmFileCreationOperation extends OrmFileCreationOperation
-{
-	public EclipseLinkOrmFileCreationOperation(IDataModel dataModel) {
-		super(dataModel);
-	}
-	
-	
-	@Override
-	protected AbstractXmlResourceProvider getXmlResourceProvider(IFile file) {
-		return EclipseLinkOrmXmlResourceProvider.getXmlResourceProvider(file);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkBasicCollectionAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkBasicCollectionAnnotationDefinition.java
deleted file mode 100644
index ad504bf147..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkBasicCollectionAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkBasicCollectionAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkBasicCollectionAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicCollectionAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.BasicCollection
- */
-public class EclipseLinkBasicCollectionAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkBasicCollectionAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkBasicCollectionAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkBasicCollectionAnnotation(parent, annotatedElement);
-	}
-	
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkBasicCollectionAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkBasicCollectionAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkBasicMapAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkBasicMapAnnotationDefinition.java
deleted file mode 100644
index 24edc251d5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkBasicMapAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkBasicMapAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkBasicMapAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicMapAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.BasicMap
- */
-public class EclipseLinkBasicMapAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkBasicMapAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkBasicMapAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkBasicMapAnnotation(parent, annotatedElement);
-	}
-	
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkBasicMapAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkBasicMapAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkCacheAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkCacheAnnotationDefinition.java
deleted file mode 100644
index 8932478ef8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkCacheAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkCacheAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkCacheAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCacheAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Cache
- */
-public class EclipseLinkCacheAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkCacheAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkCacheAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkCacheAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		return new NullEclipseLinkCacheAnnotation(parent);
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkCacheAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkCacheAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkChangeTrackingAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkChangeTrackingAnnotationDefinition.java
deleted file mode 100644
index 6e9f5ed41a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkChangeTrackingAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkChangeTrackingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkChangeTrackingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkChangeTrackingAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ChangeTracking
- */
-public class EclipseLinkChangeTrackingAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkChangeTrackingAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkChangeTrackingAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkChangeTrackingAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkChangeTrackingAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkChangeTrackingAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkConvertAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkConvertAnnotationDefinition.java
deleted file mode 100644
index 3ff2c2a540..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkConvertAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkConvertAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkConvertAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConvertAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Convert
- */
-public class EclipseLinkConvertAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkConvertAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkConvertAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkConvertAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkConvertAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkConvertAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkConverterAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkConverterAnnotationDefinition.java
deleted file mode 100644
index 40c08a1a10..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkConverterAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Converter
- */
-public class EclipseLinkConverterAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkConverterAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkConverterAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkConverterAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkConverterAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkConverterAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkCustomizerAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkCustomizerAnnotationDefinition.java
deleted file mode 100644
index d90ab00882..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkCustomizerAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkCustomizerAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkCustomizerAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCustomizerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Customizer
- */
-public class EclipseLinkCustomizerAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkCustomizerAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkCustomizerAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkCustomizerAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkCustomizerAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkCustomizerAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkExistenceCheckingAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkExistenceCheckingAnnotationDefinition.java
deleted file mode 100644
index 5a46c5fd4f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkExistenceCheckingAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkExistenceCheckingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkExistenceCheckingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkExistenceCheckingAnnotation;
- 
-/**
- * org.eclipse.persistence.annotations.ExistenceChecking
- */
-public class EclipseLinkExistenceCheckingAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkExistenceCheckingAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkExistenceCheckingAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkExistenceCheckingAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkExistenceCheckingAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkExistenceCheckingAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkJoinFetchAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkJoinFetchAnnotationDefinition.java
deleted file mode 100644
index b9965fd207..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkJoinFetchAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkJoinFetchAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkJoinFetchAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.JoinFetch
- */
-public class EclipseLinkJoinFetchAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkJoinFetchAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkJoinFetchAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkJoinFetchAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		return new NullEclipseLinkJoinFetchAnnotation(parent);
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkJoinFetchAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkJoinFetchAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkMutableAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkMutableAnnotationDefinition.java
deleted file mode 100644
index 448bcf6502..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkMutableAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkMutableAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkMutableAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkMutableAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Mutable
- */
-public class EclipseLinkMutableAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkMutableAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkMutableAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkMutableAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkMutableAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkMutableAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkObjectTypeConverterAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkObjectTypeConverterAnnotationDefinition.java
deleted file mode 100644
index fcb2dfbe7f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkObjectTypeConverterAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkObjectTypeConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkObjectTypeConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkObjectTypeConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ObjectTypeConverter
- */
-public class EclipseLinkObjectTypeConverterAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkObjectTypeConverterAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkObjectTypeConverterAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkObjectTypeConverterAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkObjectTypeConverterAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkObjectTypeConverterAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkPrimaryKeyAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkPrimaryKeyAnnotationDefinition.java
deleted file mode 100644
index 73e41c3798..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkPrimaryKeyAnnotationDefinition.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkPrimaryKeyAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkPrimaryKeyAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrimaryKeyAnnotation;
-
-public class EclipseLinkPrimaryKeyAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE 
-			= new EclipseLinkPrimaryKeyAnnotationDefinition();
-	
-	
-	/**
-	 * Return the singleton
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkPrimaryKeyAnnotationDefinition() {
-		super();
-	}
-	
-	
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkPrimaryKeyAnnotation(parent, annotatedElement);
-	}
-	
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-	
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkPrimaryKeyAnnotation(parent, jdtAnnotation);
-	}
-	
-	public String getAnnotationName() {
-		return EclipseLinkPrimaryKeyAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkPrivateOwnedAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkPrivateOwnedAnnotationDefinition.java
deleted file mode 100644
index cd6847e3bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkPrivateOwnedAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkPrivateOwnedAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkPrivateOwnedAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrivateOwnedAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.PrivateOwned
- */
-public class EclipseLinkPrivateOwnedAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkPrivateOwnedAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkPrivateOwnedAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkPrivateOwnedAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkPrivateOwnedAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkPrivateOwnedAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkReadOnlyAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkReadOnlyAnnotationDefinition.java
deleted file mode 100644
index 402a0c5fb5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkReadOnlyAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkReadOnlyAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkReadOnlyAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkReadOnlyAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadOnly
- */
-public class EclipseLinkReadOnlyAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkReadOnlyAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkReadOnlyAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkReadOnlyAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkReadOnlyAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkReadOnlyAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkReadTransformerAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkReadTransformerAnnotationDefinition.java
deleted file mode 100644
index 94ff51b4a7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkReadTransformerAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkReadTransformerAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkReadTransformerAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkReadTransformerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadTransformer
- */
-public class EclipseLinkReadTransformerAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkReadTransformerAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkReadTransformerAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkReadTransformerAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkReadTransformerAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkReadTransformerAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkStructConverterAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkStructConverterAnnotationDefinition.java
deleted file mode 100644
index b8993247eb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkStructConverterAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkStructConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkStructConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkStructConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.StructConverter
- */
-public class EclipseLinkStructConverterAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkStructConverterAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkStructConverterAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkStructConverterAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkStructConverterAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkStructConverterAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkTransformationAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkTransformationAnnotationDefinition.java
deleted file mode 100644
index 0d27fb0462..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkTransformationAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkTransformationAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkTransformationAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformationAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Transformation
- */
-public class EclipseLinkTransformationAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkTransformationAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkTransformationAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkTransformationAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		return new NullEclipseLinkTransformationAnnotation(parent);
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkTransformationAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkTransformationAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkTypeConverterAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkTypeConverterAnnotationDefinition.java
deleted file mode 100644
index 540ed98b72..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkTypeConverterAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkTypeConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkTypeConverterAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTypeConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.TypeConverter
- */
-public class EclipseLinkTypeConverterAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkTypeConverterAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkTypeConverterAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkTypeConverterAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkTypeConverterAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkTypeConverterAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkVariableOneToOneAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkVariableOneToOneAnnotationDefinition.java
deleted file mode 100644
index bd2b0d5fff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkVariableOneToOneAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkVariableOneToOneAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkVariableOneToOneAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkVariableOneToOneAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.VariableOneToOne
- */
-public class EclipseLinkVariableOneToOneAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkVariableOneToOneAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkVariableOneToOneAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkVariableOneToOneAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkVariableOneToOneAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkVariableOneToOneAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkWriteTransformerAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkWriteTransformerAnnotationDefinition.java
deleted file mode 100644
index 13773e428b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/EclipseLinkWriteTransformerAnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryEclipseLinkWriteTransformerAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceEclipseLinkWriteTransformerAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkWriteTransformerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.WriteTransformer
- */
-public class EclipseLinkWriteTransformerAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkWriteTransformerAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkWriteTransformerAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkWriteTransformerAnnotation(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkWriteTransformerAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkWriteTransformerAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkCacheAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkCacheAnnotation.java
deleted file mode 100644
index cd4ebef1fa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkCacheAnnotation.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.NullAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCacheAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTimeOfDayAnnotation;
-
-/**
- * <code>org.eclipse.persistence.annotations.Cache</code>
- */
-public final class NullEclipseLinkCacheAnnotation
-	extends NullAnnotation<EclipseLinkCacheAnnotation>
-	implements EclipseLinkCacheAnnotation
-{
-	protected NullEclipseLinkCacheAnnotation(JavaResourceAnnotatedElement parent) {
-		super(parent);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	// ***** type
-	public CacheType getType() {
-		return null;
-	}
-
-	public void setType(CacheType type) {
-		if (type != null) {
-			this.addAnnotation().setType(type);
-		}
-	}
-
-	public TextRange getTypeTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	// ***** size
-	public Integer getSize() {
-		return null;
-	}
-
-	public void setSize(Integer size) {
-		if (size != null) {
-			this.addAnnotation().setSize(size);
-		}
-	}
-
-	public TextRange getSizeTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	// ***** shared
-	public Boolean getShared() {
-		return null;
-	}
-
-	public void setShared(Boolean shared) {
-		if (shared != null) {
-			this.addAnnotation().setShared(shared);
-		}
-	}
-
-	public TextRange getSharedTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	// ***** always refresh
-	public Boolean getAlwaysRefresh() {
-		return null;
-	}
-
-	public void setAlwaysRefresh(Boolean alwaysRefresh) {
-		if (alwaysRefresh != null) {
-			this.addAnnotation().setAlwaysRefresh(alwaysRefresh);
-		}
-	}
-
-	public TextRange getAlwaysRefreshTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	// ***** refresh only if newer
-	public Boolean getRefreshOnlyIfNewer() {
-		return null;
-	}
-
-	public void setRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer) {
-		if (refreshOnlyIfNewer != null) {
-			this.addAnnotation().setRefreshOnlyIfNewer(refreshOnlyIfNewer);
-		}
-	}
-
-	public TextRange getRefreshOnlyIfNewerTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	// ***** disable hits
-	public Boolean getDisableHits() {
-		return null;
-	}
-
-	public void setDisableHits(Boolean disableHits) {
-		if (disableHits != null) {
-			this.addAnnotation().setDisableHits(disableHits);
-		}
-	}
-
-	public TextRange getDisablesHitsTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	// ***** coordination type
-	public CacheCoordinationType getCoordinationType() {
-		return null;
-	}
-
-	public void setCoordinationType(CacheCoordinationType coordinationType) {
-		if (coordinationType != null) {
-			this.addAnnotation().setCoordinationType(coordinationType);
-		}
-	}
-
-	public TextRange getCoordinationTypeTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	// ***** expiry
-	public Integer getExpiry() {
-		return null;
-	}
-
-	public void setExpiry(Integer expiry) {
-		if (expiry != null) {
-			this.addAnnotation().setExpiry(expiry);
-		}
-	}
-
-	public TextRange getExpiryTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-
-	// ***** expiry time of day
-	public EclipseLinkTimeOfDayAnnotation getExpiryTimeOfDay() {
-		return null;
-	}
-
-	public EclipseLinkTimeOfDayAnnotation addExpiryTimeOfDay() {
-		return this.addAnnotation().addExpiryTimeOfDay();
-	}
-
-	public void removeExpiryTimeOfDay() {
-		// do nothing
-	}
-
-	public TextRange getExpiryTimeOfDayTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkJoinFetchAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkJoinFetchAnnotation.java
deleted file mode 100644
index e29ecd3062..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkJoinFetchAnnotation.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.NullAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.JoinFetchType;
-
-/**
- * <code>org.eclipse.persistence.annotations.JoinFetch</code>
- */
-public final class NullEclipseLinkJoinFetchAnnotation
-	extends NullAnnotation<EclipseLinkJoinFetchAnnotation>
-	implements EclipseLinkJoinFetchAnnotation
-{
-	protected NullEclipseLinkJoinFetchAnnotation(JavaResourceAnnotatedElement parent) {
-		super(parent);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	// ***** value
-	public JoinFetchType getValue() {
-		return null;
-	}
-
-	public void setValue(JoinFetchType value) {
-		if (value != null) {
-			this.addAnnotation().setValue(value);
-		}
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkTransformationAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkTransformationAnnotation.java
deleted file mode 100644
index a319a9707e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkTransformationAnnotation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.NullAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.java.FetchType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformationAnnotation;
-
-/**
- * <code>org.eclipse.persistence.annotations.Transformation</code>
- */
-public final class NullEclipseLinkTransformationAnnotation
-	extends NullAnnotation<EclipseLinkTransformationAnnotation>
-	implements EclipseLinkTransformationAnnotation
-{	
-	protected NullEclipseLinkTransformationAnnotation(JavaResourceAnnotatedElement parent) {
-		super(parent);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	// ***** fetch
-	public FetchType getFetch() {
-		return null;
-	}
-	
-	public void setFetch(FetchType fetch) {
-		if (fetch != null) {
-			this.addAnnotation().setFetch(fetch);
-		}				
-	}
-	
-	public TextRange getFetchTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-	
-	// ***** optional
-	public Boolean getOptional() {
-		return null;
-	}
-
-	public void setOptional(Boolean optional) {
-		if (optional != null) {
-			this.addAnnotation().setOptional(optional);
-		}				
-	}
-
-	public TextRange getOptionalTextRange(CompilationUnit astRoot) {
-		return null;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkWriteTransformerColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkWriteTransformerColumnAnnotation.java
deleted file mode 100644
index c508768725..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/NullEclipseLinkWriteTransformerColumnAnnotation.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java;
-
-import org.eclipse.jpt.jpa.core.internal.resource.java.NullColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkWriteTransformerAnnotation;
-
-/**
- * <code>javax.persistence.Column</code>
- */
-public final class NullEclipseLinkWriteTransformerColumnAnnotation
-	extends NullColumnAnnotation
-{	
-	public NullEclipseLinkWriteTransformerColumnAnnotation(EclipseLinkWriteTransformerAnnotation parent) {
-		super(parent);
-	}
-
-	private EclipseLinkWriteTransformerAnnotation getWriteTransformerAnnotation() {
-		return (EclipseLinkWriteTransformerAnnotation) this.parent;
-	}
-	
-	@Override
-	protected ColumnAnnotation addAnnotation() {
-		return this.getWriteTransformerAnnotation().addColumn();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryBaseEclipseLinkConvertAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryBaseEclipseLinkConvertAnnotation.java
deleted file mode 100644
index 1abb8bfd89..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryBaseEclipseLinkConvertAnnotation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConvertAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Convert
- * org.eclipse.persistence.annotations.MapKeyConvert
- */
-public abstract class BinaryBaseEclipseLinkConvertAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkConvertAnnotation
-{
-	private String value;
-
-	protected BinaryBaseEclipseLinkConvertAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.value = this.buildValue();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** ConvertAnnotation implementation **********
-
-	// ***** value
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String value) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setValue_(String value) {
-		String old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	private String buildValue() {
-		return (String) this.getJdtMemberValue(this.getValueElementName());
-	}
-
-	protected abstract String getValueElementName();
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean valueTouches(int pos, CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryBaseEclipseLinkTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryBaseEclipseLinkTypeConverterAnnotation.java
deleted file mode 100644
index b3cbed86e7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryBaseEclipseLinkTypeConverterAnnotation.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.BaseEclipseLinkTypeConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ObjectTypeConverter
- * org.eclipse.persistence.annotations.TypeConverter
- */
-abstract class BinaryBaseEclipseLinkTypeConverterAnnotation
-	extends BinaryEclipseLinkNamedConverterAnnotation
-	implements BaseEclipseLinkTypeConverterAnnotation
-{
-	String dataType;
-	String objectType;
-
-
-	BinaryBaseEclipseLinkTypeConverterAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.dataType = this.buildDataType();
-		this.objectType = this.buildObjectType();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDataType_(this.buildDataType());
-		this.setObjectType_(this.buildObjectType());
-	}
-
-
-	// ********** ObjectTypeConverterAnnotation implementation **********
-
-	// ***** data type
-	public String getDataType() {
-		return this.dataType;
-	}
-
-	public void setDataType(String dataType) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setDataType_(String dataType) {
-		String old = this.dataType;
-		this.dataType = dataType;
-		this.firePropertyChanged(DATA_TYPE_PROPERTY, old, dataType);
-	}
-
-	public String getFullyQualifiedDataType() {
-		return this.dataType;
-	}
-
-	private String buildDataType() {
-		return (String) this.getJdtMemberValue(this.getDataTypeElementName());
-	}
-
-	public TextRange getDataTypeTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	abstract String getDataTypeElementName();
-
-	// ***** object type
-	public String getObjectType() {
-		return this.objectType;
-	}
-
-	public void setObjectType(String objectType) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setObjectType_(String objectType) {
-		String old = this.objectType;
-		this.objectType = objectType;
-		this.firePropertyChanged(OBJECT_TYPE_PROPERTY, old, objectType);
-	}
-
-	public String getFullyQualifiedObjectType() {
-		return this.objectType;
-	}
-
-	private String buildObjectType() {
-		return (String) this.getJdtMemberValue(this.getObjectTypeElementName());
-	}
-
-	public TextRange getObjectTypeTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	abstract String getObjectTypeElementName();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkBasicCollectionAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkBasicCollectionAnnotation.java
deleted file mode 100644
index b3db1a0770..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkBasicCollectionAnnotation.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicCollectionAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.BasicCollection
- */
-public final class BinaryEclipseLinkBasicCollectionAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkBasicCollectionAnnotation
-{
-	public BinaryEclipseLinkBasicCollectionAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkBasicMapAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkBasicMapAnnotation.java
deleted file mode 100644
index 90a6124b89..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkBasicMapAnnotation.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicMapAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.BasicMap
- */
-public final class BinaryEclipseLinkBasicMapAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkBasicMapAnnotation
-{
-	public BinaryEclipseLinkBasicMapAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCacheAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCacheAnnotation.java
deleted file mode 100644
index 286cf12fde..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCacheAnnotation.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCacheAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTimeOfDayAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Cache
- */
-public final class BinaryEclipseLinkCacheAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkCacheAnnotation
-{
-	private CacheType type;
-	private Integer size;
-	private Boolean shared;
-	private Integer expiry;
-	private EclipseLinkTimeOfDayAnnotation expiryTimeOfDay;
-	private Boolean alwaysRefresh;
-	private Boolean refreshOnlyIfNewer;
-	private Boolean disableHits;
-	private CacheCoordinationType coordinationType;
-
-
-	public BinaryEclipseLinkCacheAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.type = this.buildType();
-		this.size = this.buildSize();
-		this.shared = this.buildShared();
-		this.expiry = this.buildExpiry();
-		this.expiryTimeOfDay = this.buildExpiryTimeOfDay();
-		this.alwaysRefresh = this.buildAlwaysRefresh();
-		this.refreshOnlyIfNewer = this.buildRefreshOnlyIfNewer();
-		this.disableHits = this.buildDisableHits();
-		this.coordinationType = this.buildCoordinationType();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	// TODO
-	@Override
-	public void update() {
-		super.update();
-		this.setType_(this.buildType());
-		this.setSize_(this.buildSize());
-		this.setShared_(this.buildShared());
-		this.setExpiry_(this.buildExpiry());
-		this.updateExpiryTimeOfDay();
-		this.setAlwaysRefresh_(this.buildAlwaysRefresh());
-		this.setRefreshOnlyIfNewer_(this.buildRefreshOnlyIfNewer());
-		this.setDisableHits_(this.buildDisableHits());
-		this.setCoordinationType_(this.buildCoordinationType());
-	}
-
-
-	// ********** CacheAnnotation implementation **********
-
-	// ***** type
-	public CacheType getType() {
-		return this.type;
-	}
-
-	public void setType(CacheType type) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setType_(CacheType type) {
-		CacheType old = this.type;
-		this.type = type;
-		this.firePropertyChanged(TYPE_PROPERTY, old, type);
-	}
-
-	private CacheType buildType() {
-		return CacheType.fromJavaAnnotationValue(this.getJdtMemberValue(EclipseLink.CACHE__TYPE));
-	}
-
-	public TextRange getTypeTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** size
-	public Integer getSize() {
-		return this.size;
-	}
-
-	public void setSize(Integer size) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setSize_(Integer size) {
-		Integer old = this.size;
-		this.size = size;
-		this.firePropertyChanged(SIZE_PROPERTY, old, size);
-	}
-
-	private Integer buildSize() {
-		return (Integer) this.getJdtMemberValue(EclipseLink.CACHE__SIZE);
-	}
-
-	public TextRange getSizeTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** shared
-	public Boolean getShared() {
-		return this.shared;
-	}
-
-	public void setShared(Boolean shared) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setShared_(Boolean shared) {
-		Boolean old = this.shared;
-		this.shared = shared;
-		this.firePropertyChanged(SHARED_PROPERTY, old, shared);
-	}
-
-	private Boolean buildShared() {
-		return (Boolean) this.getJdtMemberValue(EclipseLink.CACHE__SHARED);
-	}
-
-	public TextRange getSharedTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** expiry
-	public Integer getExpiry() {
-		return this.expiry;
-	}
-
-	public void setExpiry(Integer expiry) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setExpiry_(Integer expiry) {
-		Integer old = this.expiry;
-		this.expiry = expiry;
-		this.firePropertyChanged(EXPIRY_PROPERTY, old, expiry);
-	}
-
-	private Integer buildExpiry() {
-		return (Integer) this.getJdtMemberValue(EclipseLink.CACHE__EXPIRY);
-	}
-
-	public TextRange getExpiryTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** expiry time of day
-	public EclipseLinkTimeOfDayAnnotation getExpiryTimeOfDay() {
-		return this.expiryTimeOfDay;
-	}
-
-	public EclipseLinkTimeOfDayAnnotation addExpiryTimeOfDay() {
-		throw new UnsupportedOperationException();
-	}
-
-	public void removeExpiryTimeOfDay() {
-		throw new UnsupportedOperationException();
-	}
-
-	private EclipseLinkTimeOfDayAnnotation buildExpiryTimeOfDay() {
-		IAnnotation jdtTimeOfDay = this.getJdtExpiryTimeOfDay();
-		return (jdtTimeOfDay == null) ? null : this.buildTimeOfDay(jdtTimeOfDay);
-	}
-
-	private EclipseLinkTimeOfDayAnnotation buildTimeOfDay(IAnnotation jdtTimeOfDay) {
-		return new BinaryEclipseLinkTimeOfDayAnnotation(this, jdtTimeOfDay);
-	}
-
-	private IAnnotation getJdtExpiryTimeOfDay() {
-		return (IAnnotation) this.getJdtMemberValue(EclipseLink.CACHE__EXPIRY_TIME_OF_DAY);
-	}
-
-	private void setExpiryTimeOfDay(EclipseLinkTimeOfDayAnnotation expiryTimeOfDay) {
-		EclipseLinkTimeOfDayAnnotation old = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = expiryTimeOfDay;
-		this.firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, old, expiryTimeOfDay);
-	}
-
-	// TODO
-	private void updateExpiryTimeOfDay() {
-		throw new UnsupportedOperationException();
-//		IAnnotation jdtTimeOfDay = this.getJdtExpiryTimeOfDay();
-//		if (jdtTimeOfDay == null) {
-//			this.setExpiryTimeOfDay(null);
-//		} else {
-//			if (this.expiryTimeOfDay == null) {
-//				this.setExpiryTimeOfDay(this.buildTimeOfDay(jdtTimeOfDay));
-//			} else {
-//				this.expiryTimeOfDay.update(jdtTimeOfDay);
-//			}
-//		}
-	}
-
-	public TextRange getExpiryTimeOfDayTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** always refresh
-	public Boolean getAlwaysRefresh() {
-		return this.alwaysRefresh;
-	}
-
-	public void setAlwaysRefresh(Boolean alwaysRefresh) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setAlwaysRefresh_(Boolean alwaysRefresh) {
-		Boolean old = this.alwaysRefresh;
-		this.alwaysRefresh = alwaysRefresh;
-		this.firePropertyChanged(ALWAYS_REFRESH_PROPERTY, old, alwaysRefresh);
-	}
-
-	private Boolean buildAlwaysRefresh() {
-		return (Boolean) this.getJdtMemberValue(EclipseLink.CACHE__ALWAYS_REFRESH);
-	}
-
-	public TextRange getAlwaysRefreshTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** refresh only if newer
-	public Boolean getRefreshOnlyIfNewer() {
-		return this.refreshOnlyIfNewer;
-	}
-
-	public void setRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setRefreshOnlyIfNewer_(Boolean refreshOnlyIfNewer) {
-		Boolean old = this.refreshOnlyIfNewer;
-		this.refreshOnlyIfNewer = refreshOnlyIfNewer;
-		this.firePropertyChanged(REFRESH_ONLY_IF_NEWER_PROPERTY, old, refreshOnlyIfNewer);
-	}
-
-	private Boolean buildRefreshOnlyIfNewer() {
-		return (Boolean) this.getJdtMemberValue(EclipseLink.CACHE__REFRESH_ONLY_IF_NEWER);
-	}
-
-	public TextRange getRefreshOnlyIfNewerTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** disable hits
-	public Boolean getDisableHits() {
-		return this.disableHits;
-	}
-
-	public void setDisableHits(Boolean disableHits) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setDisableHits_(Boolean disableHits) {
-		Boolean old = this.disableHits;
-		this.disableHits = disableHits;
-		this.firePropertyChanged(DISABLE_HITS_PROPERTY, old, disableHits);
-	}
-
-	private Boolean buildDisableHits() {
-		return (Boolean) this.getJdtMemberValue(EclipseLink.CACHE__DISABLE_HITS);
-	}
-
-	public TextRange getDisablesHitsTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** coordination type
-	public CacheCoordinationType getCoordinationType() {
-		return this.coordinationType;
-	}
-
-	public void setCoordinationType(CacheCoordinationType coordinationType) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setCoordinationType_(CacheCoordinationType coordinationType) {
-		CacheCoordinationType old = this.coordinationType;
-		this.coordinationType = coordinationType;
-		this.firePropertyChanged(TYPE_PROPERTY, old, coordinationType);
-	}
-
-	private CacheCoordinationType buildCoordinationType() {
-		return CacheCoordinationType.fromJavaAnnotationValue(this.getJdtMemberValue(EclipseLink.CACHE__COORDINATION_TYPE));
-	}
-
-	public TextRange getCoordinationTypeTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkChangeTrackingAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkChangeTrackingAnnotation.java
deleted file mode 100644
index 3fbfd3dcf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkChangeTrackingAnnotation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkChangeTrackingAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ChangeTracking
- */
-public final class BinaryEclipseLinkChangeTrackingAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkChangeTrackingAnnotation
-{
-	private ChangeTrackingType value;
-
-
-	public BinaryEclipseLinkChangeTrackingAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.value = this.buildValue();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	// TODO
-	@Override
-	public void update() {
-		super.update();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** ChangeTrackingAnnotation implementation **********
-
-	// ***** value
-	public ChangeTrackingType getValue() {
-		return this.value;
-	}
-
-	public void setValue(ChangeTrackingType value) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setValue_(ChangeTrackingType value) {
-		ChangeTrackingType old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	private ChangeTrackingType buildValue() {
-		return ChangeTrackingType.fromJavaAnnotationValue(this.getJdtMemberValue(EclipseLink.CHANGE_TRACKING__VALUE));
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConversionValueAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConversionValueAnnotation.java
deleted file mode 100644
index 25d07da0ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConversionValueAnnotation.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConversionValueAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ConversionValue
- */
-final class BinaryEclipseLinkConversionValueAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkConversionValueAnnotation
-{
-	private String dataValue;
-	private String objectValue;
-
-
-	BinaryEclipseLinkConversionValueAnnotation(JavaResourceNode parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.dataValue = this.buildDataValue();
-		this.objectValue = this.buildObjectValue();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDataValue_(this.buildDataValue());
-		this.setObjectValue_(this.buildObjectValue());
-	}
-
-
-	// ********** ConversionValueAnnotation implementation **********
-
-	// ***** data value
-	public String getDataValue() {
-		return this.dataValue;
-	}
-
-	public void setDataValue(String dataValue) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setDataValue_(String dataValue) {
-		String old = this.dataValue;
-		this.dataValue = dataValue;
-		this.firePropertyChanged(DATA_VALUE_PROPERTY, old, dataValue);
-	}
-
-	private String buildDataValue() {
-		return (String) this.getJdtMemberValue(EclipseLink.CONVERSION_VALUE__DATA_VALUE);
-	}
-
-	public TextRange getDataValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** object value
-	public String getObjectValue() {
-		return this.objectValue;
-	}
-
-	public void setObjectValue(String objectValue) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setObjectValue_(String objectValue) {
-		String old = this.objectValue;
-		this.objectValue = objectValue;
-		this.firePropertyChanged(OBJECT_VALUE_PROPERTY, old, objectValue);
-	}
-
-	private String buildObjectValue() {
-		return (String) this.getJdtMemberValue(EclipseLink.CONVERSION_VALUE__OBJECT_VALUE);
-	}
-
-	public TextRange getObjectValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConvertAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConvertAnnotation.java
deleted file mode 100644
index c78feb57ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConvertAnnotation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-
-/**
- * org.eclipse.persistence.annotations.Convert
- */
-public final class BinaryEclipseLinkConvertAnnotation
-	extends BinaryBaseEclipseLinkConvertAnnotation
-{
-
-	public BinaryEclipseLinkConvertAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	protected String getValueElementName() {
-		return EclipseLink.CONVERT__VALUE;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConverterAnnotation.java
deleted file mode 100644
index 131832ded7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkConverterAnnotation.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Converter
- */
-public final class BinaryEclipseLinkConverterAnnotation
-	extends BinaryEclipseLinkNamedConverterAnnotation
-	implements EclipseLinkConverterAnnotation
-{
-	private String converterClass;
-
-
-	public BinaryEclipseLinkConverterAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.converterClass = this.buildConverterClass();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setConverterClass_(this.buildConverterClass());
-	}
-
-
-	// ********** BinaryNamedConverterAnnotation implementation **********
-
-	@Override
-	String getNameElementName() {
-		return EclipseLink.CONVERTER__NAME;
-	}
-
-	// ********** ConverterAnnotation implementation **********
-
-	// ***** converter class
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-
-	public void setConverterClass(String converterClass) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setConverterClass_(String converterClass) {
-		String old = this.converterClass;
-		this.converterClass = converterClass;
-		this.firePropertyChanged(CONVERTER_CLASS_PROPERTY, old, converterClass);
-	}
-
-	public String getFullyQualifiedConverterClassName() {
-		return this.converterClass;
-	}
-
-	private String buildConverterClass() {
-		return (String) this.getJdtMemberValue(EclipseLink.CONVERTER__CONVERTER_CLASS);
-	}
-
-	public TextRange getConverterClassTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean converterClassImplementsInterface(String interfaceName, CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCustomizerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCustomizerAnnotation.java
deleted file mode 100644
index 32d51d8aff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkCustomizerAnnotation.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCustomizerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Customizer
- */
-public final class BinaryEclipseLinkCustomizerAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkCustomizerAnnotation
-{
-	private String value;
-
-
-	public BinaryEclipseLinkCustomizerAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.value = this.buildValue();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** CustomizerAnnotation implementation **********
-
-	// ***** value
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String value) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setValue_(String value) {
-		String old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-	
-	// ***** fully-qualified customizer class name
-	public String getFullyQualifiedCustomizerClassName() {
-		return this.value;
-	}
-
-	private String buildValue() {
-		return (String) this.getJdtMemberValue(EclipseLink.CUSTOMIZER__VALUE);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean customizerClassImplementsInterface(String interfaceName, CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkExistenceCheckingAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkExistenceCheckingAnnotation.java
deleted file mode 100644
index 09ab28c7ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkExistenceCheckingAnnotation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkExistenceCheckingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.ExistenceType;
-
-/**
- * org.eclipse.persistence.annotations.ExistenceChecking
- */
-public final class BinaryEclipseLinkExistenceCheckingAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkExistenceCheckingAnnotation
-{
-	private ExistenceType value;
-
-
-	public BinaryEclipseLinkExistenceCheckingAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.value = this.buildValue();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** ExistenceCheckingAnnotation implementation **********
-
-	// ***** value
-	public ExistenceType getValue() {
-		return this.value;
-	}
-
-	public void setValue(ExistenceType value) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setValue_(ExistenceType value) {
-		ExistenceType old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	private ExistenceType buildValue() {
-		return ExistenceType.fromJavaAnnotationValue(this.getJdtMemberValue(EclipseLink.EXISTENCE_CHECKING__VALUE));
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkJoinFetchAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkJoinFetchAnnotation.java
deleted file mode 100644
index 978caf3279..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkJoinFetchAnnotation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.JoinFetchType;
-
-/**
- * org.eclipse.persistence.annotations.JoinFetch
- */
-public final class BinaryEclipseLinkJoinFetchAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkJoinFetchAnnotation
-{
-	private JoinFetchType value;
-
-
-	public BinaryEclipseLinkJoinFetchAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.value = this.buildValue();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** BinaryJoinFetchAnnotation implementation **********
-
-	// ***** value
-	public JoinFetchType getValue() {
-		return this.value;
-	}
-
-	public void setValue(JoinFetchType value) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setValue_(JoinFetchType value) {
-		JoinFetchType old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	private JoinFetchType buildValue() {
-		return JoinFetchType.fromJavaAnnotationValue(this.getJdtMemberValue(EclipseLink.JOIN_FETCH__VALUE));
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkMutableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkMutableAnnotation.java
deleted file mode 100644
index caeb0a36f5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkMutableAnnotation.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkMutableAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Mutable
- */
-public final class BinaryEclipseLinkMutableAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkMutableAnnotation
-{
-	private Boolean value;
-
-
-	public BinaryEclipseLinkMutableAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.value = this.buildValue();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** MutableAnnotation implementation **********
-
-	// ***** value
-	public Boolean getValue() {
-		return this.value;
-	}
-
-	public void setValue(Boolean value) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setValue_(Boolean value) {
-		Boolean old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	private Boolean buildValue() {
-		return (Boolean) this.getJdtMemberValue(EclipseLink.MUTABLE__VALUE);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkNamedConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkNamedConverterAnnotation.java
deleted file mode 100644
index 031d082645..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkNamedConverterAnnotation.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Converter
- * org.eclipse.persistence.annotations.StructConverter
- * org.eclipse.persistence.annotations.TypeConverter
- * org.eclipse.persistence.annotations.ObjectTypeConverter
- */
-abstract class BinaryEclipseLinkNamedConverterAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkNamedConverterAnnotation
-{
-	String name;
-
-	BinaryEclipseLinkNamedConverterAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.name = this.buildName();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setName_(this.buildName());
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.name);
-	}
-
-
-	// ********** NamedConverterAnnotation implementation **********
-
-	// ***** name
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String name) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setName_(String name) {
-		String old = this.name;
-		this.name = name;
-		this.firePropertyChanged(NAME_PROPERTY, old, name);
-	}
-
-	private String buildName() {
-		return (String) this.getJdtMemberValue(this.getNameElementName());
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	abstract String getNameElementName();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkObjectTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkObjectTypeConverterAnnotation.java
deleted file mode 100644
index d86d7a8fff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkObjectTypeConverterAnnotation.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import java.util.Vector;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConversionValueAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkObjectTypeConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ObjectTypeConverter
- */
-public final class BinaryEclipseLinkObjectTypeConverterAnnotation
-	extends BinaryBaseEclipseLinkTypeConverterAnnotation
-	implements EclipseLinkObjectTypeConverterAnnotation
-{
-	private String defaultObjectValue;
-	private final Vector<EclipseLinkConversionValueAnnotation> conversionValues;
-
-
-	public BinaryEclipseLinkObjectTypeConverterAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.defaultObjectValue = this.buildDefaultObjectValue();
-		this.conversionValues = this.buildConversionValues();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setDefaultObjectValue_(this.buildDefaultObjectValue());
-		this.updateConversionValues();
-	}
-
-
-	// ********** BinaryNamedConverterAnnotation implementation **********
-
-	@Override
-	String getNameElementName() {
-		return EclipseLink.OBJECT_TYPE_CONVERTER__NAME;
-	}
-
-	// ********** BinaryBaseTypeConverterAnnotation implementation **********
-
-	@Override
-	String getDataTypeElementName() {
-		return EclipseLink.OBJECT_TYPE_CONVERTER__DATA_TYPE;
-	}
-
-	@Override
-	String getObjectTypeElementName() {
-		return EclipseLink.OBJECT_TYPE_CONVERTER__OBJECT_TYPE;
-	}
-
-	// ********** ObjectTypeConverterAnnotation implementation **********
-
-	// ***** default object value
-	public String getDefaultObjectValue() {
-		return this.defaultObjectValue;
-	}
-
-	public void setDefaultObjectValue(String defaultObjectValue) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setDefaultObjectValue_(String defaultObjectValue) {
-		String old = this.defaultObjectValue;
-		this.defaultObjectValue = defaultObjectValue;
-		this.firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, old, defaultObjectValue);
-	}
-
-	private String buildDefaultObjectValue() {
-		return (String) this.getJdtMemberValue(EclipseLink.OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE);
-	}
-
-	public TextRange getDefaultObjectValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** conversion values
-	public ListIterable<EclipseLinkConversionValueAnnotation> getConversionValues() {
-		return new LiveCloneListIterable<EclipseLinkConversionValueAnnotation>(this.conversionValues);
-	}
-
-	public int getConversionValuesSize() {
-		return this.conversionValues.size();
-	}
-
-	public EclipseLinkConversionValueAnnotation conversionValueAt(int index) {
-		return this.conversionValues.get(index);
-	}
-
-	public EclipseLinkConversionValueAnnotation addConversionValue(int index) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void moveConversionValue(int targetIndex, int sourceIndex) {
-		throw new UnsupportedOperationException();
-	}
-
-	public void removeConversionValue(int index) {
-		throw new UnsupportedOperationException();
-	}
-
-	private Vector<EclipseLinkConversionValueAnnotation> buildConversionValues() {
-		Object[] jdtConversionValues = this.getJdtMemberValues(EclipseLink.OBJECT_TYPE_CONVERTER__CONVERSION_VALUES);
-		Vector<EclipseLinkConversionValueAnnotation> result = new Vector<EclipseLinkConversionValueAnnotation>(jdtConversionValues.length);
-		for (Object jdtConversionValue : jdtConversionValues) {
-			result.add(new BinaryEclipseLinkConversionValueAnnotation(this, (IAnnotation) jdtConversionValue));
-		}
-		return result;
-	}
-
-	// TODO
-	private void updateConversionValues() {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkPrimaryKeyAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkPrimaryKeyAnnotation.java
deleted file mode 100644
index b9826b04b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkPrimaryKeyAnnotation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrimaryKeyAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.PrimaryKey
- */
-public class BinaryEclipseLinkPrimaryKeyAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkPrimaryKeyAnnotation
-{
-	public BinaryEclipseLinkPrimaryKeyAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-	
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkPrivateOwnedAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkPrivateOwnedAnnotation.java
deleted file mode 100644
index a565257393..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkPrivateOwnedAnnotation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrivateOwnedAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.PrivateOwned
- */
-public final class BinaryEclipseLinkPrivateOwnedAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkPrivateOwnedAnnotation
-{
-
-	public BinaryEclipseLinkPrivateOwnedAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkReadOnlyAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkReadOnlyAnnotation.java
deleted file mode 100644
index cfcd2aa3e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkReadOnlyAnnotation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkReadOnlyAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadOnly
- */
-public final class BinaryEclipseLinkReadOnlyAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkReadOnlyAnnotation
-{
-
-	public BinaryEclipseLinkReadOnlyAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkReadTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkReadTransformerAnnotation.java
deleted file mode 100644
index 5c6c594cde..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkReadTransformerAnnotation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkReadTransformerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadTransformer
- */
-public final class BinaryEclipseLinkReadTransformerAnnotation
-	extends BinaryEclipseLinkTransformerAnnotation
-	implements EclipseLinkReadTransformerAnnotation
-{
-
-	public BinaryEclipseLinkReadTransformerAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-
-	// ********** BinaryTransformerAnnotation implementation **********
-
-	@Override
-	String getTransformerClassElementName() {
-		return EclipseLink.READ_TRANSFORMER__TRANSFORMER_CLASS;
-	}
-
-	@Override
-	String getMethodElementName() {
-		return EclipseLink.READ_TRANSFORMER__METHOD;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkStructConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkStructConverterAnnotation.java
deleted file mode 100644
index 52deb968a7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkStructConverterAnnotation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkStructConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.StructConverter
- */
-public final class BinaryEclipseLinkStructConverterAnnotation
-	extends BinaryEclipseLinkNamedConverterAnnotation
-	implements EclipseLinkStructConverterAnnotation
-{
-	private String converter;
-
-
-	public BinaryEclipseLinkStructConverterAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.converter = this.buildConverter();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setConverter_(this.buildConverter());
-	}
-
-
-	// ********** BinaryNamedConverterAnnotation implementation **********
-
-	@Override
-	String getNameElementName() {
-		return EclipseLink.STRUCT_CONVERTER__NAME;
-	}
-
-
-	// ********** StructConverterAnnotation implementation **********
-
-	// ***** converter
-	public String getConverter() {
-		return this.converter;
-	}
-
-	public void setConverter(String converter) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setConverter_(String converter) {
-		String old = this.converter;
-		this.converter = converter;
-		this.firePropertyChanged(CONVERTER_PROPERTY, old, converter);
-	}
-
-	private String buildConverter() {
-		return (String) this.getJdtMemberValue(EclipseLink.STRUCT_CONVERTER__CONVERTER);
-	}
-
-	public TextRange getConverterTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTimeOfDayAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTimeOfDayAnnotation.java
deleted file mode 100644
index 98d51b6607..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTimeOfDayAnnotation.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTimeOfDayAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.TimeOfDay
- */
-public final class BinaryEclipseLinkTimeOfDayAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkTimeOfDayAnnotation
-{
-	private Integer hour;
-	private Integer minute;
-	private Integer second;
-	private Integer millisecond;
-
-
-	public BinaryEclipseLinkTimeOfDayAnnotation(JavaResourceNode parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.hour = this.buildHour();
-		this.minute = this.buildMinute();
-		this.second = this.buildSecond();
-		this.millisecond = this.buildMillisecond();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setHour_(this.buildHour());
-		this.setMinute_(this.buildMinute());
-		this.setSecond_(this.buildSecond());
-		this.setMillisecond_(this.buildMillisecond());
-	}
-
-
-	// ********** TimeOfDayAnnotation implementation **********
-
-	// ***** hour
-	public Integer getHour() {
-		return this.hour;
-	}
-
-	public void setHour(Integer hour) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setHour_(Integer hour) {
-		Integer old = this.hour;
-		this.hour = hour;
-		this.firePropertyChanged(HOUR_PROPERTY, old, hour);
-	}
-
-	private Integer buildHour() {
-		return (Integer) this.getJdtMemberValue(EclipseLink.TIME_OF_DAY__HOUR);
-	}
-
-	public TextRange getHourTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** minute
-	public Integer getMinute() {
-		return this.minute;
-	}
-
-	public void setMinute(Integer newMinute) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setMinute_(Integer newMinute) {
-		Integer oldMinute = this.minute;
-		this.minute = newMinute;
-		this.firePropertyChanged(MINUTE_PROPERTY, oldMinute, newMinute);
-	}
-
-	private Integer buildMinute() {
-		return (Integer) this.getJdtMemberValue(EclipseLink.TIME_OF_DAY__MINUTE);
-	}
-
-	public TextRange getMinuteTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** second
-	public Integer getSecond() {
-		return this.second;
-	}
-
-	public void setSecond(Integer newSecond) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setSecond_(Integer newSecond) {
-		Integer oldSecond = this.second;
-		this.second = newSecond;
-		this.firePropertyChanged(SECOND_PROPERTY, oldSecond, newSecond);
-	}
-
-	private Integer buildSecond() {
-		return (Integer) this.getJdtMemberValue(EclipseLink.TIME_OF_DAY__SECOND);
-	}
-
-	public TextRange getSecondTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** millisecond
-	public Integer getMillisecond() {
-		return this.millisecond;
-	}
-
-	public void setMillisecond(Integer newMillisecond) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setMillisecond_(Integer newMillisecond) {
-		Integer oldMillisecond = this.millisecond;
-		this.millisecond = newMillisecond;
-		this.firePropertyChanged(MILLISECOND_PROPERTY, oldMillisecond, newMillisecond);
-	}
-
-	private Integer buildMillisecond() {
-		return (Integer) this.getJdtMemberValue(EclipseLink.TIME_OF_DAY__MILLISECOND);
-	}
-
-	public TextRange getMillisecondTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTransformationAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTransformationAnnotation.java
deleted file mode 100644
index 26cc1abd5b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTransformationAnnotation.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.java.FetchType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformationAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Transformation
- */
-public class BinaryEclipseLinkTransformationAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkTransformationAnnotation
-{
-	private FetchType fetch;
-	private Boolean optional;
-
-
-	public BinaryEclipseLinkTransformationAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.fetch = this.buildFetch();
-		this.optional = this.buildOptional();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setFetch_(this.buildFetch());
-		this.setOptional_(this.buildOptional());
-	}
-
-
-	// ********** TransformationAnnotation implementation **********
-
-	// ***** fetch
-	public FetchType getFetch() {
-		return this.fetch;
-	}
-
-	public void setFetch(FetchType fetch) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setFetch_(FetchType fetch) {
-		FetchType old = this.fetch;
-		this.fetch = fetch;
-		this.firePropertyChanged(FETCH_PROPERTY, old, fetch);
-	}
-
-	private FetchType buildFetch() {
-		return FetchType.fromJavaAnnotationValue(this.getJdtMemberValue(EclipseLink.TRANSFORMATION__FETCH));
-	}
-
-	public TextRange getFetchTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** optional
-	public Boolean getOptional() {
-		return this.optional;
-	}
-
-	public void setOptional(Boolean optional) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setOptional_(Boolean optional) {
-		Boolean old = this.optional;
-		this.optional = optional;
-		this.firePropertyChanged(OPTIONAL_PROPERTY, old, optional);
-	}
-
-	private Boolean buildOptional() {
-		return (Boolean) this.getJdtMemberValue(EclipseLink.TRANSFORMATION__OPTIONAL);
-	}
-
-	public TextRange getOptionalTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTransformerAnnotation.java
deleted file mode 100644
index a7b2e212c0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTransformerAnnotation.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadTransformer
- * org.eclipse.persistence.annotations.WriteTransformer
- */
-abstract class BinaryEclipseLinkTransformerAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkTransformerAnnotation
-{
-	private String transformerClass;
-	private String method;
-
-
-	BinaryEclipseLinkTransformerAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.transformerClass = this.buildTransformerClass();
-		this.method = this.buildMethod();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setTransformerClass_(this.buildTransformerClass());
-		this.setMethod_(this.buildMethod());
-	}
-
-
-	// ********** TransformerAnnotation implementation **********
-
-	// ***** transformer class
-	public String getTransformerClass() {
-		return this.transformerClass;
-	}
-
-	public void setTransformerClass(String transformerClass) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setTransformerClass_(String transformerClass) {
-		String old = this.transformerClass;
-		this.transformerClass = transformerClass;
-		this.firePropertyChanged(TRANSFORMER_CLASS_PROPERTY, old, transformerClass);
-	}
-
-	private String buildTransformerClass() {
-		return (String) this.getJdtMemberValue(this.getTransformerClassElementName());
-	}
-
-	public TextRange getTransformerClassTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	abstract String getTransformerClassElementName();
-
-	// ***** method
-	public String getMethod() {
-		return this.method;
-	}
-
-	public void setMethod(String method) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setMethod_(String method) {
-		String old = this.method;
-		this.method = method;
-		this.firePropertyChanged(METHOD_PROPERTY, old, method);
-	}
-
-	private String buildMethod() {
-		return (String) this.getJdtMemberValue(this.getMethodElementName());
-	}
-
-	public TextRange getMethodTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	abstract String getMethodElementName();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTypeConverterAnnotation.java
deleted file mode 100644
index 9ffe93b996..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkTypeConverterAnnotation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTypeConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.TypeConverter
- */
-public final class BinaryEclipseLinkTypeConverterAnnotation
-	extends BinaryBaseEclipseLinkTypeConverterAnnotation
-	implements EclipseLinkTypeConverterAnnotation
-{
-	public BinaryEclipseLinkTypeConverterAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-
-	// ********** BinaryNamedConverterAnnotation implementation **********
-
-	@Override
-	String getNameElementName() {
-		return EclipseLink.TYPE_CONVERTER__NAME;
-	}
-
-
-	// ********** BinaryBaseTypeConverterAnnotation implementation **********
-
-	@Override
-	String getDataTypeElementName() {
-		return EclipseLink.TYPE_CONVERTER__DATA_TYPE;
-	}
-
-	@Override
-	String getObjectTypeElementName() {
-		return EclipseLink.TYPE_CONVERTER__OBJECT_TYPE;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkVariableOneToOneAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkVariableOneToOneAnnotation.java
deleted file mode 100644
index 1fcd8aeabb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkVariableOneToOneAnnotation.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkVariableOneToOneAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.VariableOneToOne
- */
-public class BinaryEclipseLinkVariableOneToOneAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkVariableOneToOneAnnotation
-{
-	public BinaryEclipseLinkVariableOneToOneAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkWriteTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkWriteTransformerAnnotation.java
deleted file mode 100644
index 792fb52ca5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/binary/BinaryEclipseLinkWriteTransformerAnnotation.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.NullEclipseLinkWriteTransformerColumnAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkWriteTransformerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadTransformer
- */
-public class BinaryEclipseLinkWriteTransformerAnnotation
-	extends BinaryEclipseLinkTransformerAnnotation
-	implements EclipseLinkWriteTransformerAnnotation
-{
-	private ColumnAnnotation column;
-	private final ColumnAnnotation nullColumn;
-
-
-	public BinaryEclipseLinkWriteTransformerAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.column = this.buildColumn();
-		this.nullColumn = this.buildNullColumn();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.updateColumn();
-	}
-
-
-	// ********** BinaryTransformerAnnotation implementation **********
-
-	@Override
-	String getTransformerClassElementName() {
-		return EclipseLink.WRITE_TRANSFORMER__TRANSFORMER_CLASS;
-	}
-
-	@Override
-	String getMethodElementName() {
-		return EclipseLink.WRITE_TRANSFORMER__METHOD;
-	}
-
-
-	// ********** WriteTransformerAnnotation implementation **********
-
-	// ***** column
-	public ColumnAnnotation getColumn() {
-		return this.column;
-	}
-
-	public ColumnAnnotation getNonNullColumn() {
-		return (this.column != null) ? this.column : this.nullColumn;
-	}
-
-	public ColumnAnnotation addColumn() {
-		throw new UnsupportedOperationException();
-	}
-
-	public void removeColumn() {
-		throw new UnsupportedOperationException();
-	}
-
-	public TextRange getColumnTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	private ColumnAnnotation buildColumn() {
-		IAnnotation jdtColumn = this.getJdtColumn();
-		return (jdtColumn == null) ? null : this.buildColumn(jdtColumn);
-	}
-
-	private ColumnAnnotation buildNullColumn() {
-		return new NullEclipseLinkWriteTransformerColumnAnnotation(this);
-	}
-
-	private ColumnAnnotation buildColumn(IAnnotation jdtColumn) {
-		return new BinaryColumnAnnotation(this, jdtColumn);
-	}
-
-	private IAnnotation getJdtColumn() {
-		return (IAnnotation) this.getJdtMemberValue(EclipseLink.WRITE_TRANSFORMER__COLUMN);
-	}
-
-	private void setColumn(ColumnAnnotation column) {
-		ColumnAnnotation old = this.column;
-		this.column = column;
-		this.firePropertyChanged(COLUMN_PROPERTY, old, column);
-	}
-
-	// TODO
-	private void updateColumn() {
-		throw new UnsupportedOperationException();
-//		IAnnotation jdtColumn = this.getJdtColumn();
-//		if (jdtColumn == null) {
-//			this.setColumn(null);
-//		} else {
-//			if (this.column == null) {
-//				this.setColumn(this.buildColumn(jdtColumn));
-//			} else {
-//				this.column.update(jdtColumn);
-//			}
-//		}
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceBaseEclipseLinkConvertAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceBaseEclipseLinkConvertAnnotation.java
deleted file mode 100644
index 57d1b934f7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceBaseEclipseLinkConvertAnnotation.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.StringExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConvertAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Convert
- * org.eclipse.persistence.annotations.MapKeyConvert
- */
-public abstract class SourceBaseEclipseLinkConvertAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkConvertAnnotation
-{
-	private final DeclarationAnnotationElementAdapter<String> valueDeclarationAdapter;
-	private final AnnotationElementAdapter<String> valueAdapter;
-	private String value;
-
-
-	protected SourceBaseEclipseLinkConvertAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element, DeclarationAnnotationAdapter daa) {
-		super(parent, element, daa);
-		this.valueDeclarationAdapter = this.buildValueDeclarationAdapter();
-		this.valueAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, this.valueDeclarationAdapter);
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.buildValue(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncValue(this.buildValue(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.value == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-
-	// ********** ConvertAnnotation implementation **********
-
-	// ***** value
-
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String value) {
-		if (this.attributeValueHasChanged(this.value, value)) {
-			this.value = value;
-			this.valueAdapter.setValue(value);
-		}
-	}
-
-	private void syncValue(String astValue) {
-		String old = this.value;
-		this.value = astValue;
-		this.firePropertyChanged(VALUE_PROPERTY, old, astValue);
-	}
-
-	private String buildValue(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.valueDeclarationAdapter, astRoot);
-	}
-
-	public boolean valueTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.valueDeclarationAdapter, pos, astRoot);
-	}
-
-	private DeclarationAnnotationElementAdapter<String> buildValueDeclarationAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(this.daa, this.getValueElementName(), StringExpressionConverter.instance());
-	}
-
-	protected abstract String getValueElementName();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceBaseEclipseLinkTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceBaseEclipseLinkTypeConverterAnnotation.java
deleted file mode 100644
index c3800fede8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceBaseEclipseLinkTypeConverterAnnotation.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.TypeStringExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.BaseEclipseLinkTypeConverterAnnotation;
-
-/**
- * <code>
- * <ul>
- * <li>org.eclipse.persistence.annotations.TypeConverter
- * <li>org.eclipse.persistence.annotations.ObjectTypeConverter
- * </ul>
- * </code>
- */
-abstract class SourceBaseEclipseLinkTypeConverterAnnotation
-	extends SourceEclipseLinkNamedConverterAnnotation
-	implements BaseEclipseLinkTypeConverterAnnotation
-{
-	final DeclarationAnnotationElementAdapter<String> dataTypeDeclarationAdapter;
-	final AnnotationElementAdapter<String> dataTypeAdapter;
-	String dataType;
-	TextRange dataTypeTextRange;
-
-	/**
-	 * @see org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceIdClassAnnotation#fullyQualifiedClassName
-	 */
-	String fullyQualifiedDataType;
-	// we need a flag since the f-q name can be null
-	boolean fqDataTypeStale = true;
-
-	final DeclarationAnnotationElementAdapter<String> objectTypeDeclarationAdapter;
-	final AnnotationElementAdapter<String> objectTypeAdapter;
-	String objectType;
-	TextRange objectTypeTextRange;
-
-	/**
-	 * @see org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceIdClassAnnotation#fullyQualifiedClassName
-	 */
-	String fullyQualifiedObjectType;
-	// we need a flag since the f-q name can be null
-	boolean fqObjectTypeStale = true;
-
-
-	SourceBaseEclipseLinkTypeConverterAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element, DeclarationAnnotationAdapter daa) {
-		super(parent, element, daa);
-		this.dataTypeDeclarationAdapter = this.buildTypeAdapter(this.getDataTypeElementName());
-		this.dataTypeAdapter = new AnnotatedElementAnnotationElementAdapter<String>(this.annotatedElement, this.dataTypeDeclarationAdapter);
-
-		this.objectTypeDeclarationAdapter = this.buildTypeAdapter(this.getObjectTypeElementName());
-		this.objectTypeAdapter = new AnnotatedElementAnnotationElementAdapter<String>(this.annotatedElement, this.objectTypeDeclarationAdapter);
-	}
-
-	private DeclarationAnnotationElementAdapter<String> buildTypeAdapter(String elementName) {
-		 // false = do not remove annotation when empty
-		return new ConversionDeclarationAnnotationElementAdapter<String>(this.daa, elementName, TypeStringExpressionConverter.instance());
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.dataType = this.buildDataType(astRoot);
-		this.dataTypeTextRange = this.buildDataTypeTextRange(astRoot);
-		this.objectType = this.buildObjectType(astRoot);
-		this.objectTypeTextRange = this.buildObjectTypeTextRange(astRoot);
-	}
-
-	@Override
-	public void synchronizeWith(CompilationUnit astRoot) {
-		super.synchronizeWith(astRoot);
-		this.syncDataType(this.buildDataType(astRoot));
-		this.dataTypeTextRange = this.buildDataTypeTextRange(astRoot);
-		this.syncObjectType(this.buildObjectType(astRoot));
-		this.objectTypeTextRange = this.buildObjectTypeTextRange(astRoot);
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.dataType == null) &&
-				(this.objectType == null);
-	}
-
-
-	// ********** BaseTypeConverterAnnotation implementation **********
-
-	// ***** data type
-	public String getDataType() {
-		return this.dataType;
-	}
-
-	public void setDataType(String dataType) {
-		if (this.attributeValueHasChanged(this.dataType, dataType)) {
-			this.dataType = dataType;
-			this.fqDataTypeStale = true;
-			this.dataTypeAdapter.setValue(dataType);
-		}
-	}
-
-	private void syncDataType(String astDataType) {
-		if (this.attributeValueHasChanged(this.dataType, astDataType)) {
-			this.syncDataType_(astDataType);
-		}
-	}
-
-	private void syncDataType_(String astDataType) {
-		String old = this.dataType;
-		this.dataType = astDataType;
-		this.fqDataTypeStale = true;
-		this.firePropertyChanged(DATA_TYPE_PROPERTY, old, astDataType);
-	}
-
-	private String buildDataType(CompilationUnit astRoot) {
-		return this.dataTypeAdapter.getValue(astRoot);
-	}
-
-	public TextRange getDataTypeTextRange(CompilationUnit astRoot) {
-		return this.dataTypeTextRange;
-	}
-
-	private TextRange buildDataTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.dataTypeDeclarationAdapter, astRoot);
-	}
-
-	abstract String getDataTypeElementName();
-
-	// ***** fully-qualified data type
-	public String getFullyQualifiedDataType() {
-		if (this.fqDataTypeStale) {
-			this.fullyQualifiedDataType = this.buildFullyQualifiedDataType();
-			this.fqDataTypeStale = false;
-		}
-		return this.fullyQualifiedDataType;
-	}
-
-	private String buildFullyQualifiedDataType() {
-		return (this.dataType == null) ? null : this.buildFullyQualifiedDataType_();
-	}
-
-	private String buildFullyQualifiedDataType_() {
-		return ASTTools.resolveFullyQualifiedName(this.dataTypeAdapter.getExpression(this.buildASTRoot()));
-	}
-
-	// ***** object type
-	public String getObjectType() {
-		return this.objectType;
-	}
-
-	public void setObjectType(String objectType) {
-		if (this.attributeValueHasChanged(this.objectType, objectType)) {
-			this.objectType = objectType;
-			this.fqObjectTypeStale = true;
-			this.objectTypeAdapter.setValue(objectType);
-		}
-	}
-
-	private void syncObjectType(String astObjectType) {
-		if (this.attributeValueHasChanged(this.objectType, astObjectType)) {
-			this.syncObjectType_(astObjectType);
-		}
-	}
-
-	private void syncObjectType_(String astObjectType) {
-		String old = this.objectType;
-		this.objectType = astObjectType;
-		this.fqObjectTypeStale = true;
-		this.firePropertyChanged(OBJECT_TYPE_PROPERTY, old, astObjectType);
-	}
-
-	private String buildObjectType(CompilationUnit astRoot) {
-		return this.objectTypeAdapter.getValue(astRoot);
-	}
-
-	public TextRange getObjectTypeTextRange(CompilationUnit astRoot) {
-		return this.objectTypeTextRange;
-	}
-
-	private TextRange buildObjectTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.objectTypeDeclarationAdapter, astRoot);
-	}
-
-	abstract String getObjectTypeElementName();
-
-	// ***** fully-qualified object type
-	public String getFullyQualifiedObjectType() {
-		if (this.fqObjectTypeStale) {
-			this.fullyQualifiedObjectType = this.buildFullyQualifiedObjectType();
-			this.fqObjectTypeStale = false;
-		}
-		return this.fullyQualifiedObjectType;
-	}
-
-	private String buildFullyQualifiedObjectType() {
-		return (this.objectType == null) ? null : this.buildFullyQualifiedObjectType_();
-	}
-
-	private String buildFullyQualifiedObjectType_() {
-		return ASTTools.resolveFullyQualifiedName(this.objectTypeAdapter.getExpression(this.buildASTRoot()));
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkBasicCollectionAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkBasicCollectionAnnotation.java
deleted file mode 100644
index e38edd3c39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkBasicCollectionAnnotation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicCollectionAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.BasicCollection
- */
-public final class SourceEclipseLinkBasicCollectionAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkBasicCollectionAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	
-	public SourceEclipseLinkBasicCollectionAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		// do nothing
-	}
-	
-	public void synchronizeWith(CompilationUnit astRoot) {
-		// do nothing
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkBasicMapAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkBasicMapAnnotation.java
deleted file mode 100644
index 5e40d37aa8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkBasicMapAnnotation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicMapAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.BasicMap
- */
-public final class SourceEclipseLinkBasicMapAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkBasicMapAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	
-	public SourceEclipseLinkBasicMapAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		// do nothing
-	}
-	
-	public void synchronizeWith(CompilationUnit astRoot) {
-		// do nothing
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCacheAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCacheAnnotation.java
deleted file mode 100644
index 0c3b88b91a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCacheAnnotation.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.BooleanExpressionConverter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ElementAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.NestedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.NumberIntegerExpressionConverter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheCoordinationType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.CacheType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCacheAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTimeOfDayAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Cache
- */
-public final class SourceEclipseLinkCacheAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkCacheAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> TYPE_ADAPTER = buildTypeAdapter();
-	private final AnnotationElementAdapter<String> typeAdapter;
-	private CacheType type;
-
-	private static final DeclarationAnnotationElementAdapter<Integer> SIZE_ADAPTER = buildSizeAdapter();
-	private final AnnotationElementAdapter<Integer> sizeAdapter;
-	private Integer size;
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> SHARED_ADAPTER = buildSharedAdapter();
-	private final AnnotationElementAdapter<Boolean> sharedAdapter;
-	private Boolean shared;
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> ALWAYS_REFRESH_ADAPTER = buildAlwaysRefreshAdapter();
-	private final AnnotationElementAdapter<Boolean> alwaysRefreshAdapter;
-	private Boolean alwaysRefresh;
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> REFRESH_ONLY_IF_NEWER_ADAPTER = buildRefreshOnlyIfNewerAdapter();
-	private final AnnotationElementAdapter<Boolean> refreshOnlyIfNewerAdapter;
-	private Boolean refreshOnlyIfNewer;
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> DISABLE_HITS_ADAPTER = buildDisableHitsAdapter();
-	private final AnnotationElementAdapter<Boolean> disableHitsAdapter;
-	private Boolean disableHits;
-
-	private static final DeclarationAnnotationElementAdapter<String> COORDINATION_TYPE_ADAPTER = buildCoordinationTypeAdapter();
-	private final AnnotationElementAdapter<String> coordinationTypeAdapter;
-	private CacheCoordinationType coordinationType;
-
-	private static final DeclarationAnnotationElementAdapter<Integer> EXPIRY_ADAPTER = buildExpiryAdapter();
-	private final AnnotationElementAdapter<Integer> expiryAdapter;
-	private Integer expiry;
-
-	private static final NestedDeclarationAnnotationAdapter EXPIRY_TIME_OF_DAY_ADAPTER = buildExpiryTimeOfDayAdapter();
-	private final ElementAnnotationAdapter expiryTimeOfDayAdapter;
-	private EclipseLinkTimeOfDayAnnotation expiryTimeOfDay;
-
-
-	public SourceEclipseLinkCacheAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.typeAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, TYPE_ADAPTER);
-		this.sizeAdapter = new AnnotatedElementAnnotationElementAdapter<Integer>(element, SIZE_ADAPTER);
-		this.sharedAdapter = new AnnotatedElementAnnotationElementAdapter<Boolean>(element, SHARED_ADAPTER);
-		this.alwaysRefreshAdapter = new AnnotatedElementAnnotationElementAdapter<Boolean>(element, ALWAYS_REFRESH_ADAPTER);
-		this.refreshOnlyIfNewerAdapter = new AnnotatedElementAnnotationElementAdapter<Boolean>(element, REFRESH_ONLY_IF_NEWER_ADAPTER);
-		this.disableHitsAdapter = new AnnotatedElementAnnotationElementAdapter<Boolean>(element, DISABLE_HITS_ADAPTER);
-		this.coordinationTypeAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, COORDINATION_TYPE_ADAPTER);
-		this.expiryAdapter = new AnnotatedElementAnnotationElementAdapter<Integer>(element, EXPIRY_ADAPTER);
-		this.expiryTimeOfDayAdapter = new ElementAnnotationAdapter(element, EXPIRY_TIME_OF_DAY_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.type = this.buildType(astRoot);
-		this.size = this.buildSize(astRoot);
-		this.shared = this.buildShared(astRoot);
-		this.alwaysRefresh = this.buildAlwaysRefresh(astRoot);
-		this.refreshOnlyIfNewer = this.buildRefreshOnlyIfNewer(astRoot);
-		this.disableHits = this.buildDisableHits(astRoot);
-		this.coordinationType = this.buildCoordinationType(astRoot);
-		this.expiry = this.buildExpiry(astRoot);
-		this.initializeExpiryTimeOfDay(astRoot);
-	}
-
-	private void initializeExpiryTimeOfDay(CompilationUnit astRoot) {
-		if (this.expiryTimeOfDayAdapter.getAnnotation(astRoot) != null) {
-			this.expiryTimeOfDay = this.buildExpiryTimeOfDay();
-			this.expiryTimeOfDay.initialize(astRoot);
-		}
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncType(this.buildType(astRoot));
-		this.syncSize(this.buildSize(astRoot));
-		this.syncShared(this.buildShared(astRoot));
-		this.syncAlwaysRefresh(this.buildAlwaysRefresh(astRoot));
-		this.syncRefreshOnlyIfNewer(this.buildRefreshOnlyIfNewer(astRoot));
-		this.syncDisableHits(this.buildDisableHits(astRoot));
-		this.syncCoordinationType(this.buildCoordinationType(astRoot));
-		this.syncExpiry(this.buildExpiry(astRoot));
-		this.syncExpiryTimeOfDay(astRoot);
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.type == null) &&
-				(this.size == null) &&
-				(this.shared == null) &&
-				(this.alwaysRefresh == null) &&
-				(this.refreshOnlyIfNewer == null) &&
-				(this.disableHits == null) &&
-				(this.coordinationType == null) &&
-				(this.expiry == null) &&
-				(this.expiryTimeOfDay == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.type);
-	}
-
-
-	// ********** CacheAnnotation implementation **********
-
-	// ***** type
-	public CacheType getType() {
-		return this.type;
-	}
-
-	public void setType(CacheType type) {
-		if (this.attributeValueHasChanged(this.type, type)) {
-			this.type = type;
-			this.typeAdapter.setValue(CacheType.toJavaAnnotationValue(type));
-		}
-	}
-
-	private void syncType(CacheType astType) {
-		CacheType old = this.type;
-		this.type = astType;
-		this.firePropertyChanged(TYPE_PROPERTY, old, astType);
-	}
-
-	private CacheType buildType(CompilationUnit astRoot) {
-		return CacheType.fromJavaAnnotationValue(this.typeAdapter.getValue(astRoot));
-	}
-
-	public TextRange getTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(TYPE_ADAPTER, astRoot);
-	}
-
-	// ***** size
-	public Integer getSize() {
-		return this.size;
-	}
-
-	public void setSize(Integer size) {
-		if (this.attributeValueHasChanged(this.size, size)) {
-			this.size = size;
-			this.sizeAdapter.setValue(size);
-		}
-	}
-
-	private void syncSize(Integer astSize) {
-		Integer old = this.size;
-		this.size = astSize;
-		this.firePropertyChanged(SIZE_PROPERTY, old, astSize);
-	}
-
-	private Integer buildSize(CompilationUnit astRoot) {
-		return this.sizeAdapter.getValue(astRoot);
-	}
-
-	public TextRange getSizeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(SIZE_ADAPTER, astRoot);
-	}
-
-	// ***** shared
-	public Boolean getShared() {
-		return this.shared;
-	}
-
-	public void setShared(Boolean shared) {
-		if (this.attributeValueHasChanged(this.shared, shared)) {
-			this.shared = shared;
-			this.sharedAdapter.setValue(shared);
-		}
-	}
-
-	private void syncShared(Boolean astShared) {
-		Boolean old = this.shared;
-		this.shared = astShared;
-		this.firePropertyChanged(SHARED_PROPERTY, old, astShared);
-	}
-
-	private Boolean buildShared(CompilationUnit astRoot) {
-		return this.sharedAdapter.getValue(astRoot);
-	}
-
-	public TextRange getSharedTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(SHARED_ADAPTER, astRoot);
-	}
-
-	// ***** always refresh
-	public Boolean getAlwaysRefresh() {
-		return this.alwaysRefresh;
-	}
-
-	public void setAlwaysRefresh(Boolean alwaysRefresh) {
-		if (this.attributeValueHasChanged(this.alwaysRefresh, alwaysRefresh)) {
-			this.alwaysRefresh = alwaysRefresh;
-			this.alwaysRefreshAdapter.setValue(alwaysRefresh);
-		}
-	}
-
-	private void syncAlwaysRefresh(Boolean astAlwaysRefresh) {
-		Boolean old = this.alwaysRefresh;
-		this.alwaysRefresh = astAlwaysRefresh;
-		this.firePropertyChanged(ALWAYS_REFRESH_PROPERTY, old, astAlwaysRefresh);
-	}
-
-	private Boolean buildAlwaysRefresh(CompilationUnit astRoot) {
-		return this.alwaysRefreshAdapter.getValue(astRoot);
-	}
-
-	public TextRange getAlwaysRefreshTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(ALWAYS_REFRESH_ADAPTER, astRoot);
-	}
-
-	// ***** refresh only if newer
-	public Boolean getRefreshOnlyIfNewer() {
-		return this.refreshOnlyIfNewer;
-	}
-
-	public void setRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer) {
-		if (this.attributeValueHasChanged(this.refreshOnlyIfNewer, refreshOnlyIfNewer)) {
-			this.refreshOnlyIfNewer = refreshOnlyIfNewer;
-			this.refreshOnlyIfNewerAdapter.setValue(refreshOnlyIfNewer);
-		}
-	}
-
-	private void syncRefreshOnlyIfNewer(Boolean astRefreshOnlyIfNewer) {
-		Boolean old = this.refreshOnlyIfNewer;
-		this.refreshOnlyIfNewer = astRefreshOnlyIfNewer;
-		this.firePropertyChanged(REFRESH_ONLY_IF_NEWER_PROPERTY, old, astRefreshOnlyIfNewer);
-	}
-
-	private Boolean buildRefreshOnlyIfNewer(CompilationUnit astRoot) {
-		return this.refreshOnlyIfNewerAdapter.getValue(astRoot);
-	}
-
-	public TextRange getRefreshOnlyIfNewerTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(REFRESH_ONLY_IF_NEWER_ADAPTER, astRoot);
-	}
-
-	// ***** disable hits
-	public Boolean getDisableHits() {
-		return this.disableHits;
-	}
-
-	public void setDisableHits(Boolean disableHits) {
-		if (this.attributeValueHasChanged(this.disableHits, disableHits)) {
-			this.disableHits = disableHits;
-			this.disableHitsAdapter.setValue(disableHits);
-		}
-	}
-
-	private void syncDisableHits(Boolean astDisableHits) {
-		Boolean old = this.disableHits;
-		this.disableHits = astDisableHits;
-		this.firePropertyChanged(DISABLE_HITS_PROPERTY, old, astDisableHits);
-	}
-
-	private Boolean buildDisableHits(CompilationUnit astRoot) {
-		return this.disableHitsAdapter.getValue(astRoot);
-	}
-
-	public TextRange getDisablesHitsTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(DISABLE_HITS_ADAPTER, astRoot);
-	}
-
-	// ***** coordination type
-	public CacheCoordinationType getCoordinationType() {
-		return this.coordinationType;
-	}
-
-	public void setCoordinationType(CacheCoordinationType coordinationType) {
-		if (this.attributeValueHasChanged(this.coordinationType, coordinationType)) {
-			this.coordinationType = coordinationType;
-			this.coordinationTypeAdapter.setValue(CacheCoordinationType.toJavaAnnotationValue(coordinationType));
-		}
-	}
-
-	private void syncCoordinationType(CacheCoordinationType astCoordinationType) {
-		CacheCoordinationType old = this.coordinationType;
-		this.coordinationType = astCoordinationType;
-		this.firePropertyChanged(TYPE_PROPERTY, old, astCoordinationType);
-	}
-
-	private CacheCoordinationType buildCoordinationType(CompilationUnit astRoot) {
-		return CacheCoordinationType.fromJavaAnnotationValue(this.coordinationTypeAdapter.getValue(astRoot));
-	}
-
-	public TextRange getCoordinationTypeTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(COORDINATION_TYPE_ADAPTER, astRoot);
-	}
-
-	// ***** expiry
-	public Integer getExpiry() {
-		return this.expiry;
-	}
-
-	public void setExpiry(Integer expiry) {
-		if (this.attributeValueHasChanged(this.expiry, expiry)) {
-			this.expiry = expiry;
-			this.expiryAdapter.setValue(expiry);
-		}
-	}
-
-	private void syncExpiry(Integer astExpiry) {
-		Integer old = this.expiry;
-		this.expiry = astExpiry;
-		this.firePropertyChanged(EXPIRY_PROPERTY, old, astExpiry);
-	}
-
-	private Integer buildExpiry(CompilationUnit astRoot) {
-		return this.expiryAdapter.getValue(astRoot);
-	}
-
-	public TextRange getExpiryTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(EXPIRY_ADAPTER, astRoot);
-	}
-
-	// ***** expiry time of day
-	public EclipseLinkTimeOfDayAnnotation getExpiryTimeOfDay() {
-		return this.expiryTimeOfDay;
-	}
-
-	public EclipseLinkTimeOfDayAnnotation addExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay != null) {
-			throw new IllegalStateException("'expiryTimeOfDay' element already exists: " + this.expiryTimeOfDay); //$NON-NLS-1$
-		}
-		this.expiryTimeOfDay = this.buildExpiryTimeOfDay();
-		this.expiryTimeOfDay.newAnnotation();
-		return this.expiryTimeOfDay;
-	}
-
-	public void removeExpiryTimeOfDay() {
-		if (this.expiryTimeOfDay == null) {
-			throw new IllegalStateException("'expiryTimeOfDay' element does not exist"); //$NON-NLS-1$
-		}
-		EclipseLinkTimeOfDayAnnotation old = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = null;
-		old.removeAnnotation();
-	}
-
-	private EclipseLinkTimeOfDayAnnotation buildExpiryTimeOfDay() {
-		return new SourceEclipseLinkTimeOfDayAnnotation(this, this.annotatedElement, EXPIRY_TIME_OF_DAY_ADAPTER);
-	}
-
-	private void syncExpiryTimeOfDay(CompilationUnit astRoot) {
-		if (this.expiryTimeOfDayAdapter.getAnnotation(astRoot) == null) {
-			this.syncExpiryTimeOfDay_(null);
-		} else {
-			if (this.expiryTimeOfDay == null) {
-				EclipseLinkTimeOfDayAnnotation tod = this.buildExpiryTimeOfDay();
-				tod.initialize(astRoot);
-				this.syncExpiryTimeOfDay_(tod);
-			} else {
-				this.expiryTimeOfDay.synchronizeWith(astRoot);
-			}
-		}
-	}
-
-	private void syncExpiryTimeOfDay_(EclipseLinkTimeOfDayAnnotation astExpiryTimeOfDay) {
-		EclipseLinkTimeOfDayAnnotation old = this.expiryTimeOfDay;
-		this.expiryTimeOfDay = astExpiryTimeOfDay;
-		this.firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, old, astExpiryTimeOfDay);
-	}
-
-	public TextRange getExpiryTimeOfDayTextRange(CompilationUnit astRoot) {
-		return this.getTextRange(this.expiryTimeOfDayAdapter.getAstNode(astRoot));
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildTypeAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__TYPE);
-	}
-
-	private static DeclarationAnnotationElementAdapter<Integer> buildSizeAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__SIZE, NumberIntegerExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<Boolean> buildSharedAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__SHARED, BooleanExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<Integer> buildExpiryAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__EXPIRY, NumberIntegerExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<Boolean> buildAlwaysRefreshAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__ALWAYS_REFRESH, BooleanExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<Boolean> buildRefreshOnlyIfNewerAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__REFRESH_ONLY_IF_NEWER, BooleanExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<Boolean> buildDisableHitsAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__DISABLE_HITS, BooleanExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildCoordinationTypeAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__COORDINATION_TYPE);
-	}
-
-	private static NestedDeclarationAnnotationAdapter buildExpiryTimeOfDayAdapter() {
-		return new NestedDeclarationAnnotationAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CACHE__EXPIRY_TIME_OF_DAY, EclipseLink.TIME_OF_DAY);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkChangeTrackingAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkChangeTrackingAnnotation.java
deleted file mode 100644
index 591d977c86..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkChangeTrackingAnnotation.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.ChangeTrackingType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkChangeTrackingAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ChangeTracking
- */
-public final class SourceEclipseLinkChangeTrackingAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkChangeTrackingAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	private final AnnotationElementAdapter<String> valueAdapter;
-	private ChangeTrackingType value;
-
-
-	public SourceEclipseLinkChangeTrackingAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, VALUE_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.buildValue(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncValue(this.buildValue(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.value == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-
-	// ********** ChangeTrackingAnnotation implementation **********
-
-	// ***** value
-	public ChangeTrackingType getValue() {
-		return this.value;
-	}
-
-	public void setValue(ChangeTrackingType value) {
-		if (this.attributeValueHasChanged(this.value, value)) {
-			this.value = value;
-			this.valueAdapter.setValue(ChangeTrackingType.toJavaAnnotationValue(value));
-		}
-	}
-
-	private void syncValue(ChangeTrackingType astValue) {
-		ChangeTrackingType old = this.value;
-		this.value = astValue;
-		this.firePropertyChanged(VALUE_PROPERTY, old, astValue);
-	}
-
-	private ChangeTrackingType buildValue(CompilationUnit astRoot) {
-		return ChangeTrackingType.fromJavaAnnotationValue(this.valueAdapter.getValue(astRoot));
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CHANGE_TRACKING__VALUE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConversionValueAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConversionValueAnnotation.java
deleted file mode 100644
index 74889ebf72..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConversionValueAnnotation.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ElementIndexedAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConversionValueAnnotation;
-
-/**
- * <code>org.eclipse.persistence.annotations.ConversionValue</code>
- */
-final class SourceEclipseLinkConversionValueAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkConversionValueAnnotation
-{
-	private DeclarationAnnotationElementAdapter<String> dataValueDeclarationAdapter;
-	private AnnotationElementAdapter<String> dataValueAdapter;
-	private String dataValue;
-	private TextRange dataValueTextRange;
-
-	private DeclarationAnnotationElementAdapter<String> objectValueDeclarationAdapter;
-	private AnnotationElementAdapter<String> objectValueAdapter;
-	private String objectValue;
-	private TextRange objectValueTextRange;
-	
-	public static SourceEclipseLinkConversionValueAnnotation buildNestedSourceConversionValueAnnotation(
-			JavaResourceNode parent, 
-			AnnotatedElement element, 
-			IndexedDeclarationAnnotationAdapter idaa) {
-		
-		return new SourceEclipseLinkConversionValueAnnotation(parent, element, idaa);
-	}
-
-	private SourceEclipseLinkConversionValueAnnotation(JavaResourceNode parent, AnnotatedElement element, IndexedDeclarationAnnotationAdapter idaa) {
-		super(parent, element, idaa, new ElementIndexedAnnotationAdapter(element, idaa));
-		this.dataValueDeclarationAdapter = this.buildDataValueDeclarationAdapter();
-		this.dataValueAdapter = this.buildDataValueAdapter();
-		this.objectValueDeclarationAdapter = this.buildObjectValueDeclarationAdapter();
-		this.objectValueAdapter = this.buildObjectValueAdapter();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.dataValue = this.buildDataValue(astRoot);
-		this.dataValueTextRange = this.buildDataValueTextRange(astRoot);
-		this.objectValue = this.buildObjectValue(astRoot);
-		this.objectValueTextRange = this.buildObjectValueTextRange(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncDataValue(this.buildDataValue(astRoot));
-		this.dataValueTextRange = this.buildDataValueTextRange(astRoot);
-		this.syncObjectValue(this.buildObjectValue(astRoot));
-		this.objectValueTextRange = this.buildObjectValueTextRange(astRoot);
-	}
-
-
-	// ********** ConversionValueAnnotation implementation **********
-
-	// ***** data value
-	public String getDataValue() {
-		return this.dataValue;
-	}
-
-	public void setDataValue(String dataValue) {
-		if (this.attributeValueHasChanged(this.dataValue, dataValue)) {
-			this.dataValue = dataValue;
-			this.dataValueAdapter.setValue(dataValue);
-		}
-	}
-
-	private void syncDataValue(String astDataValue) {
-		String old = this.dataValue;
-		this.dataValue = astDataValue;
-		this.firePropertyChanged(DATA_VALUE_PROPERTY, old, astDataValue);
-	}
-
-	private String buildDataValue(CompilationUnit astRoot) {
-		return this.dataValueAdapter.getValue(astRoot);
-	}
-
-	public TextRange getDataValueTextRange(CompilationUnit astRoot) {
-		return this.dataValueTextRange;
-	}
-
-	private TextRange buildDataValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.dataValueDeclarationAdapter, astRoot);
-	}
-
-	private DeclarationAnnotationElementAdapter<String> buildDataValueDeclarationAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(this.daa, EclipseLink.CONVERSION_VALUE__DATA_VALUE);
-	}
-
-	private AnnotationElementAdapter<String> buildDataValueAdapter() {
-		return this.buildStringElementAdapter(this.dataValueDeclarationAdapter);
-	}
-
-	// ***** object value
-	public String getObjectValue() {
-		return this.objectValue;
-	}
-
-	public void setObjectValue(String objectValue) {
-		if (this.attributeValueHasChanged(this.objectValue, objectValue)) {
-			this.objectValue = objectValue;
-			this.objectValueAdapter.setValue(objectValue);
-		}
-	}
-
-	private void syncObjectValue(String astObjectValue) {
-		String old = this.objectValue;
-		this.objectValue = astObjectValue;
-		this.firePropertyChanged(OBJECT_VALUE_PROPERTY, old, astObjectValue);
-	}
-
-	private String buildObjectValue(CompilationUnit astRoot) {
-		return this.objectValueAdapter.getValue(astRoot);
-	}
-
-	public TextRange getObjectValueTextRange(CompilationUnit astRoot) {
-		return this.objectValueTextRange;
-	}
-
-	private TextRange buildObjectValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.objectValueDeclarationAdapter, astRoot);
-	}
-
-	private DeclarationAnnotationElementAdapter<String> buildObjectValueDeclarationAdapter() {
-		return ConversionDeclarationAnnotationElementAdapter.forStrings(this.daa, EclipseLink.CONVERSION_VALUE__OBJECT_VALUE);
-	}
-
-	private AnnotationElementAdapter<String> buildObjectValueAdapter() {
-		return this.buildStringElementAdapter(this.objectValueDeclarationAdapter);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.dataValue == null) &&
-				(this.objectValue == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.dataValue);
-		sb.append("=>"); //$NON-NLS-1$
-		sb.append(this.objectValue);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConvertAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConvertAnnotation.java
deleted file mode 100644
index ad16b145d4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConvertAnnotation.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConvertAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Convert
- */
-public final class SourceEclipseLinkConvertAnnotation
-	extends SourceBaseEclipseLinkConvertAnnotation
-	implements EclipseLinkConvertAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-
-	public SourceEclipseLinkConvertAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	protected String getValueElementName() {
-		return EclipseLink.CONVERT__VALUE;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConverterAnnotation.java
deleted file mode 100644
index 86d4e4ba57..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkConverterAnnotation.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConverterAnnotation;
-
-/**
- * <code>org.eclipse.persistence.annotations.Converter</code>
- */
-public final class SourceEclipseLinkConverterAnnotation
-	extends SourceEclipseLinkNamedConverterAnnotation
-	implements EclipseLinkConverterAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> CONVERTER_CLASS_ADAPTER = buildConverterClassAdapter();
-	private final AnnotationElementAdapter<String> converterClassAdapter;
-	private String converterClass;
-	private TextRange converterClassTextRange;
-
-	/**
-	 * @see org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceIdClassAnnotation#fullyQualifiedClassName
-	 */
-	private String fullyQualifiedConverterClassName;
-	// we need a flag since the f-q name can be null
-	private boolean fqConverterClassNameStale = true;
-
-	public SourceEclipseLinkConverterAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.converterClassAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, CONVERTER_CLASS_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.converterClass = this.buildConverterClass(astRoot);
-		this.converterClassTextRange = this.buildConverterClassTextRange(astRoot);
-	}
-
-	@Override
-	public void synchronizeWith(CompilationUnit astRoot) {
-		super.synchronizeWith(astRoot);
-		this.syncConverterClass(this.buildConverterClass(astRoot));
-		this.converterClassTextRange = this.buildConverterClassTextRange(astRoot);
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.converterClass == null);
-	}
-
-
-	// ********** SourceNamedConverterAnnotation implementation **********
-
-	@Override
-	String getNameElementName() {
-		return EclipseLink.CONVERTER__NAME;
-	}
-
-
-	// ********** ConverterAnnotation implementation **********
-
-	// ***** converter class
-	public String getConverterClass() {
-		return this.converterClass;
-	}
-
-	public void setConverterClass(String converterClass) {
-		if (this.attributeValueHasChanged(this.converterClass, converterClass)) {
-			this.converterClass = converterClass;
-			this.fqConverterClassNameStale = true;
-			this.converterClassAdapter.setValue(converterClass);
-		}
-	}
-
-	private void syncConverterClass(String astConverterClass) {
-		if (this.attributeValueHasChanged(this.converterClass, astConverterClass)) {
-			this.syncConverterClass_(astConverterClass);
-		}
-	}
-
-	private void syncConverterClass_(String astConverterClass) {
-		String old = this.converterClass;
-		this.converterClass = astConverterClass;
-		this.fqConverterClassNameStale = true;
-		this.firePropertyChanged(CONVERTER_CLASS_PROPERTY, old, astConverterClass);
-	}
-
-	private String buildConverterClass(CompilationUnit astRoot) {
-		return this.converterClassAdapter.getValue(astRoot);
-	}
-
-	public TextRange getConverterClassTextRange(CompilationUnit astRoot) {
-		return this.converterClassTextRange;
-	}
-
-	private TextRange buildConverterClassTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(CONVERTER_CLASS_ADAPTER, astRoot);
-	}
-
-	public boolean converterClassImplementsInterface(String interfaceName, CompilationUnit astRoot) {
-		return (this.converterClass != null)
-				&& ASTTools.typeImplementsInterface(this.converterClassAdapter.getExpression(astRoot), interfaceName);
-	}
-
-	// ***** fully-qualified converter class name
-	public String getFullyQualifiedConverterClassName() {
-		if (this.fqConverterClassNameStale) {
-			this.fullyQualifiedConverterClassName = this.buildFullyQualifiedConverterClassName();
-			this.fqConverterClassNameStale = false;
-		}
-		return this.fullyQualifiedConverterClassName;
-	}
-
-	private String buildFullyQualifiedConverterClassName() {
-		return (this.converterClass == null) ? null : this.buildFullyQualifiedConverterClassName_();
-	}
-
-	private String buildFullyQualifiedConverterClassName_() {
-		return ASTTools.resolveFullyQualifiedName(this.converterClassAdapter.getExpression(this.buildASTRoot()));
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildConverterClassAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CONVERTER__CONVERTER_CLASS, SimpleTypeStringExpressionConverter.instance());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCustomizerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCustomizerAnnotation.java
deleted file mode 100644
index b59e03773a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkCustomizerAnnotation.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkCustomizerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Customizer
- */
-public final class SourceEclipseLinkCustomizerAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkCustomizerAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	private final AnnotationElementAdapter<String> valueAdapter;
-	private String value;
-
-	/**
-	 * @see org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceIdClassAnnotation#fullyQualifiedClassName
-	 */
-	private String fullyQualifiedCustomizerClassName;
-	// we need a flag since the f-q name can be null
-	private boolean fqCustomizerClassNameStale = true;
-
-
-	public SourceEclipseLinkCustomizerAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, VALUE_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.buildValue(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncValue(this.buildValue(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.value == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-
-	// ********** CustomizerAnnotation implementation **********
-
-	// ***** value
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String value) {
-		if (this.attributeValueHasChanged(this.value, value)) {
-			this.value = value;
-			this.fqCustomizerClassNameStale = true;
-			this.valueAdapter.setValue(value);
-		}
-	}
-
-	private void syncValue(String astValue) {
-		if (this.attributeValueHasChanged(this.value, astValue)) {
-			this.syncValue_(astValue);
-		}
-	}
-
-	private void syncValue_(String astValue) {
-		String old = this.value;
-		this.value = astValue;
-		this.fqCustomizerClassNameStale = true;
-		this.firePropertyChanged(VALUE_PROPERTY, old, astValue);
-	}
-
-	private String buildValue(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-	public boolean customizerClassImplementsInterface(String interfaceName, CompilationUnit astRoot) {
-		return (this.value != null)
-				&& ASTTools.typeIsSubTypeOf(this.valueAdapter.getExpression(astRoot), interfaceName);
-	}
-
-
-	// ***** fully-qualified customizer class name
-	public String getFullyQualifiedCustomizerClassName() {
-		if (this.fqCustomizerClassNameStale) {
-			this.fullyQualifiedCustomizerClassName = this.buildFullyQualifiedCustomizerClassName();
-			this.fqCustomizerClassNameStale = false;
-		}
-		return this.fullyQualifiedCustomizerClassName;
-	}
-
-	private String buildFullyQualifiedCustomizerClassName() {
-		return (this.value == null) ? null : this.buildFullyQualifiedCustomizerClassName_();
-	}
-
-	private String buildFullyQualifiedCustomizerClassName_() {
-		return ASTTools.resolveFullyQualifiedName(this.valueAdapter.getExpression(this.buildASTRoot()));
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.CUSTOMIZER__VALUE, SimpleTypeStringExpressionConverter.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkExistenceCheckingAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkExistenceCheckingAnnotation.java
deleted file mode 100644
index b371fe634f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkExistenceCheckingAnnotation.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkExistenceCheckingAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.ExistenceType;
-
-/**
- * org.eclipse.persistence.annotations.ExistenceChecking
- */
-public final class SourceEclipseLinkExistenceCheckingAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkExistenceCheckingAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	private final AnnotationElementAdapter<String> valueAdapter;
-	private ExistenceType value;
-
-
-	public SourceEclipseLinkExistenceCheckingAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, VALUE_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.buildValue(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncValue(this.buildValue(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.value == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-
-	// ********** ExistenceCheckingAnnotation implementation **********
-
-	// ***** value
-	public ExistenceType getValue() {
-		return this.value;
-	}
-
-	public void setValue(ExistenceType value) {
-		if (this.attributeValueHasChanged(this.value, value)) {
-			this.value = value;
-			this.valueAdapter.setValue(ExistenceType.toJavaAnnotationValue(value));
-		}
-	}
-
-	private void syncValue(ExistenceType astValue) {
-		ExistenceType old = this.value;
-		this.value = astValue;
-		this.firePropertyChanged(VALUE_PROPERTY, old, astValue);
-	}
-
-	private ExistenceType buildValue(CompilationUnit astRoot) {
-		return ExistenceType.fromJavaAnnotationValue(this.valueAdapter.getValue(astRoot));
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.EXISTENCE_CHECKING__VALUE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkJoinFetchAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkJoinFetchAnnotation.java
deleted file mode 100644
index 92f086f42a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkJoinFetchAnnotation.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.JoinFetchType;
-
-/**
- * org.eclipse.persistence.annotations.JoinFetch
- */
-public final class SourceEclipseLinkJoinFetchAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkJoinFetchAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	private final AnnotationElementAdapter<String> valueAdapter;
-	private JoinFetchType value;
-
-
-	public SourceEclipseLinkJoinFetchAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, VALUE_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.buildValue(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncValue(this.buildValue(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.value == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-
-	// ********** JoinFetchAnnotation implementation **********
-
-	// ***** value
-	public JoinFetchType getValue() {
-		return this.value;
-	}
-
-	public void setValue(JoinFetchType value) {
-		if (this.attributeValueHasChanged(this.value, value)) {
-			this.value = value;
-			this.valueAdapter.setValue(JoinFetchType.toJavaAnnotationValue(value));
-		}
-	}
-
-	private void syncValue(JoinFetchType astValue) {
-		JoinFetchType old = this.value;
-		this.value = astValue;
-		this.firePropertyChanged(VALUE_PROPERTY, old, astValue);
-	}
-
-	private JoinFetchType buildValue(CompilationUnit astRoot) {
-		return JoinFetchType.fromJavaAnnotationValue(this.valueAdapter.getValue(astRoot));
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.JOIN_FETCH__VALUE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkMutableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkMutableAnnotation.java
deleted file mode 100644
index 319d10ba64..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkMutableAnnotation.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.BooleanExpressionConverter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkMutableAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Mutable
- */
-public final class SourceEclipseLinkMutableAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkMutableAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> VALUE_ADAPTER = buildValueAdapter();
-	private final AnnotationElementAdapter<Boolean> valueAdapter;
-	private Boolean value;
-
-
-	public SourceEclipseLinkMutableAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new AnnotatedElementAnnotationElementAdapter<Boolean>(element, VALUE_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.buildValue(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncValue(this.buildValue(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.value == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-
-	// ********** MutableAnnotation implementation **********
-
-	// ***** value
-	public Boolean getValue() {
-		return this.value;
-	}
-
-	public void setValue(Boolean value) {
-		if (this.attributeValueHasChanged(this.value, value)) {
-			this.value = value;
-			this.valueAdapter.setValue(value);
-		}
-	}
-
-	private void syncValue(Boolean astValue) {
-		Boolean old = this.value;
-		this.value = astValue;
-		this.firePropertyChanged(VALUE_PROPERTY, old, astValue);
-	}
-
-	private Boolean buildValue(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<Boolean> buildValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.MUTABLE__VALUE, BooleanExpressionConverter.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkNamedConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkNamedConverterAnnotation.java
deleted file mode 100644
index 3bd96c0339..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkNamedConverterAnnotation.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.core.resource.java.OverrideAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkNamedConverterAnnotation;
-
-/**
- * <code>
- * <ul>
- * <li>org.eclipse.persistence.annotations.Converter
- * <li>org.eclipse.persistence.annotations.StructConverter
- * <li>org.eclipse.persistence.annotations.TypeConverter
- * <li>org.eclipse.persistence.annotations.ObjectTypeConverter
- * </ul>
- * </code>
- */
-abstract class SourceEclipseLinkNamedConverterAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkNamedConverterAnnotation
-{
-	final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter;
-	final AnnotationElementAdapter<String> nameAdapter;
-	String name;
-	TextRange nameTextRange;
-		
-
-	// ********** construction/initialization **********
-
-	SourceEclipseLinkNamedConverterAnnotation(JavaResourceNode parent, AnnotatedElement element, DeclarationAnnotationAdapter daa) {
-		super(parent, element, daa);
-		this.nameDeclarationAdapter = ConversionDeclarationAnnotationElementAdapter.forStrings(daa, this.getNameElementName());
-		this.nameAdapter = new AnnotatedElementAnnotationElementAdapter<String>(this.annotatedElement, this.nameDeclarationAdapter);
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.name = this.buildName(astRoot);
-		this.nameTextRange = this.buildNameTextRange(astRoot);
-	}
-	
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncName(this.buildName(astRoot));
-		this.nameTextRange = this.buildNameTextRange(astRoot);
-	}
-	
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.name == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.name);
-	}
-	
-
-	// ********** NamedConverterAnnotation implementation **********
-
-	// ***** name
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String name) {
-		if (this.attributeValueHasChanged(this.name, name)) {
-			this.name = name;
-			this.nameAdapter.setValue(name);
-		}
-	}
-
-	private void syncName(String astName) {
-		String old = this.name;
-		this.name = astName;
-		this.firePropertyChanged(OverrideAnnotation.NAME_PROPERTY, old, astName);
-	}
-
-	private String buildName(CompilationUnit astRoot) {
-		return this.nameAdapter.getValue(astRoot);
-	}
-
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
-		return this.nameTextRange;
-	}
-
-	private TextRange buildNameTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.nameDeclarationAdapter, astRoot);
-	}
-
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.nameDeclarationAdapter, pos, astRoot);
-	}
-
-	abstract String getNameElementName();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkObjectTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkObjectTypeConverterAnnotation.java
deleted file mode 100644
index acb77d31c4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkObjectTypeConverterAnnotation.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.NestedIndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.StringExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConversionValueAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkObjectTypeConverterAnnotation;
-
-/**
- * <code>org.eclipse.persistence.annotations.ObjectTypeConverter</code>
- */
-public final class SourceEclipseLinkObjectTypeConverterAnnotation
-	extends SourceBaseEclipseLinkTypeConverterAnnotation
-	implements EclipseLinkObjectTypeConverterAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> DEFAULT_OBJECT_VALUE_ADAPTER = buildDefaultObjectValueAdapter();
-	private final AnnotationElementAdapter<String> defaultObjectValueAdapter;
-	private String defaultObjectValue;
-	private TextRange defaultObjectValueTextRange;
-
-	private final ConversionValuesAnnotationContainer conversionValuesContainer = new ConversionValuesAnnotationContainer();
-
-
-	public SourceEclipseLinkObjectTypeConverterAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.defaultObjectValueAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, DEFAULT_OBJECT_VALUE_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.defaultObjectValue = this.buildDefaultObjectValue(astRoot);
-		this.defaultObjectValueTextRange = this.buildDefaultObjectValueTextRange(astRoot);
-		this.conversionValuesContainer.initialize(this.getAstAnnotation(astRoot));
-	}
-
-	@Override
-	public void synchronizeWith(CompilationUnit astRoot) {
-		super.synchronizeWith(astRoot);
-		this.syncDefaultObjectValue(this.buildDefaultObjectValue(astRoot));
-		this.defaultObjectValueTextRange = this.buildDefaultObjectValueTextRange(astRoot);
-		this.conversionValuesContainer.synchronize(this.getAstAnnotation(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.defaultObjectValue == null) &&
-				this.conversionValuesContainer.isEmpty();
-	}
-
-
-	// ********** SourceNamedConverterAnnotation implementation **********
-
-	@Override
-	String getNameElementName() {
-		return EclipseLink.OBJECT_TYPE_CONVERTER__NAME;
-	}
-
-
-	// ********** SourceBaseTypeConverterAnnotation implementation **********
-
-	@Override
-	String getDataTypeElementName() {
-		return EclipseLink.OBJECT_TYPE_CONVERTER__DATA_TYPE;
-	}
-
-	@Override
-	String getObjectTypeElementName() {
-		return EclipseLink.OBJECT_TYPE_CONVERTER__OBJECT_TYPE;
-	}
-
-
-	// ********** ObjectTypeConverterAnnotation implementation **********
-
-	// ***** default object value
-	public String getDefaultObjectValue() {
-		return this.defaultObjectValue;
-	}
-
-	public void setDefaultObjectValue(String defaultObjectValue) {
-		if (this.attributeValueHasChanged(this.defaultObjectValue, defaultObjectValue)) {
-			this.defaultObjectValue = defaultObjectValue;
-			this.defaultObjectValueAdapter.setValue(defaultObjectValue);
-		}
-	}
-
-	private void syncDefaultObjectValue(String astDefaultObjectValue) {
-		String old = this.defaultObjectValue;
-		this.defaultObjectValue = astDefaultObjectValue;
-		this.firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, old, astDefaultObjectValue);
-	}
-
-	private String buildDefaultObjectValue(CompilationUnit astRoot) {
-		return this.defaultObjectValueAdapter.getValue(astRoot);
-	}
-
-	public TextRange getDefaultObjectValueTextRange(CompilationUnit astRoot) {
-		return this.defaultObjectValueTextRange;
-	}
-
-	private TextRange buildDefaultObjectValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(DEFAULT_OBJECT_VALUE_ADAPTER, astRoot);
-	}
-
-	// ***** conversion values
-
-	public ListIterable<EclipseLinkConversionValueAnnotation> getConversionValues() {
-		return this.conversionValuesContainer.getNestedAnnotations();
-	}
-
-	public int getConversionValuesSize() {
-		return this.conversionValuesContainer.getNestedAnnotationsSize();
-	}
-
-	public EclipseLinkConversionValueAnnotation conversionValueAt(int index) {
-		return this.conversionValuesContainer.nestedAnnotationAt(index);
-	}
-
-	public EclipseLinkConversionValueAnnotation addConversionValue(int index) {
-		return this.conversionValuesContainer.addNestedAnnotation(index);
-	}
-
-	public void moveConversionValue(int targetIndex, int sourceIndex) {
-		this.conversionValuesContainer.moveNestedAnnotation(targetIndex, sourceIndex);
-	}
-
-	public void removeConversionValue(int index) {
-		this.conversionValuesContainer.removeNestedAnnotation(index);
-	}
-
-	protected EclipseLinkConversionValueAnnotation buildConversionValue(int index) {
-		return SourceEclipseLinkConversionValueAnnotation.buildNestedSourceConversionValueAnnotation(
-			this, this.annotatedElement, this.buildConversionValueIndexedDeclarationAnnotationAdapter(index));
-	}
-	
-	private IndexedDeclarationAnnotationAdapter buildConversionValueIndexedDeclarationAnnotationAdapter(int index) {
-		return new NestedIndexedDeclarationAnnotationAdapter(
-				this.daa, EclipseLink.OBJECT_TYPE_CONVERTER__CONVERSION_VALUES, index, EclipseLink.CONVERSION_VALUE);
-	}
-
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildDefaultObjectValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE, StringExpressionConverter.instance());
-	}
-
-
-	// ********** hint container **********
-	/**
-	 * adapt the AnnotationContainer interface to the xml schema's xmlns
-	 */
-	class ConversionValuesAnnotationContainer 
-		extends AnnotationContainer<EclipseLinkConversionValueAnnotation>
-	{
-		@Override
-		protected String getAnnotationsPropertyName() {
-			return CONVERSION_VALUES_LIST;
-		}
-		@Override
-		protected String getElementName() {
-			return EclipseLink.OBJECT_TYPE_CONVERTER__CONVERSION_VALUES;
-		}
-		@Override
-		protected String getNestedAnnotationName() {
-			return EclipseLinkConversionValueAnnotation.ANNOTATION_NAME;
-		}
-		@Override
-		protected EclipseLinkConversionValueAnnotation buildNestedAnnotation(int index) {
-			return SourceEclipseLinkObjectTypeConverterAnnotation.this.buildConversionValue(index);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkPrimaryKeyAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkPrimaryKeyAnnotation.java
deleted file mode 100644
index 467ee1e470..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkPrimaryKeyAnnotation.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrimaryKeyAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.PrimaryKey
- */
-public class SourceEclipseLinkPrimaryKeyAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkPrimaryKeyAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER 
-			= new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-	
-	
-	public SourceEclipseLinkPrimaryKeyAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-	
-	
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-	
-	public void initialize(CompilationUnit astRoot) {
-		// nothing to initialize
-	}
-	
-	public void synchronizeWith(CompilationUnit astRoot) {
-		// nothing to sync
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkPrivateOwnedAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkPrivateOwnedAnnotation.java
deleted file mode 100644
index da831d609c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkPrivateOwnedAnnotation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkPrivateOwnedAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.PrivateOwned
- */
-public final class SourceEclipseLinkPrivateOwnedAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkPrivateOwnedAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-
-	public SourceEclipseLinkPrivateOwnedAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		// nothing to initialize
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		// nothing to sync
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkReadOnlyAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkReadOnlyAnnotation.java
deleted file mode 100644
index ae7014e382..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkReadOnlyAnnotation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkReadOnlyAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadOnly
- */
-public final class SourceEclipseLinkReadOnlyAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkReadOnlyAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-
-	public SourceEclipseLinkReadOnlyAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		// nothing to initialize
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		// nothing to sync
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkReadTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkReadTransformerAnnotation.java
deleted file mode 100644
index 0e7fbd7bf8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkReadTransformerAnnotation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkReadTransformerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadTransformer
- */
-public final class SourceEclipseLinkReadTransformerAnnotation
-	extends SourceEclipseLinkTransformerAnnotation
-	implements EclipseLinkReadTransformerAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-
-	public SourceEclipseLinkReadTransformerAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-
-	// ********** SourceTransformerAnnotation implementation **********
-
-	@Override
-	String getTransformerClassElementName() {
-		return EclipseLink.READ_TRANSFORMER__TRANSFORMER_CLASS;
-	}
-
-	@Override
-	String getMethodElementName() {
-		return EclipseLink.READ_TRANSFORMER__METHOD;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkStructConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkStructConverterAnnotation.java
deleted file mode 100644
index c34798a57d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkStructConverterAnnotation.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.StringExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkStructConverterAnnotation;
-
-/**
- * <code>org.eclipse.persistence.annotations.StructConverter</code>
- */
-public final class SourceEclipseLinkStructConverterAnnotation
-	extends SourceEclipseLinkNamedConverterAnnotation
-	implements EclipseLinkStructConverterAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> CONVERTER_ADAPTER = buildConverterAdapter();
-	private final AnnotationElementAdapter<String> converterAdapter;
-	private String converter;
-	private TextRange converterTextRange;
-
-
-	public SourceEclipseLinkStructConverterAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.converterAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, CONVERTER_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.converter = this.buildConverter(astRoot);
-		this.converterTextRange = this.buildConverterTextRange(astRoot);
-	}
-
-	@Override
-	public void synchronizeWith(CompilationUnit astRoot) {
-		super.synchronizeWith(astRoot);
-		this.syncConverter(this.buildConverter(astRoot));
-		this.converterTextRange = this.buildConverterTextRange(astRoot);
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.converter == null);
-	}
-
-
-	// ********** SourceNamedConverterAnnotation implementation **********
-
-	@Override
-	String getNameElementName() {
-		return EclipseLink.STRUCT_CONVERTER__NAME;
-	}
-
-
-	// ********** StructConverterAnnotation implementation **********
-
-	// ***** converter
-	public String getConverter() {
-		return this.converter;
-	}
-
-	public void setConverter(String converter) {
-		if (this.attributeValueHasChanged(this.converter, converter)) {
-			this.converter = converter;
-			this.converterAdapter.setValue(converter);
-		}
-	}
-
-	private void syncConverter(String astConverter) {
-		String old = this.converter;
-		this.converter = astConverter;
-		this.firePropertyChanged(CONVERTER_PROPERTY, old, astConverter);
-	}
-
-	private String buildConverter(CompilationUnit astRoot) {
-		return this.converterAdapter.getValue(astRoot);
-	}
-
-	public TextRange getConverterTextRange(CompilationUnit astRoot) {
-		return this.converterTextRange;
-	}
-
-	private TextRange buildConverterTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(CONVERTER_ADAPTER, astRoot);
-	}
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildConverterAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.STRUCT_CONVERTER__CONVERTER, StringExpressionConverter.instance());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTimeOfDayAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTimeOfDayAnnotation.java
deleted file mode 100644
index 4955b35964..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTimeOfDayAnnotation.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.NumberIntegerExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTimeOfDayAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.TimeOfDay
- */
-public final class SourceEclipseLinkTimeOfDayAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkTimeOfDayAnnotation
-{
-	private final DeclarationAnnotationElementAdapter<Integer> hourDeclarationAdapter;
-	private final AnnotationElementAdapter<Integer> hourAdapter;
-	private Integer hour;
-
-	private final DeclarationAnnotationElementAdapter<Integer> minuteDeclarationAdapter;
-	private final AnnotationElementAdapter<Integer> minuteAdapter;
-	private Integer minute;
-
-	private final DeclarationAnnotationElementAdapter<Integer> secondDeclarationAdapter;
-	private final AnnotationElementAdapter<Integer> secondAdapter;
-	private Integer second;
-
-	private final DeclarationAnnotationElementAdapter<Integer> millisecondDeclarationAdapter;
-	private final AnnotationElementAdapter<Integer> millisecondAdapter;
-	private Integer millisecond;
-
-
-	public SourceEclipseLinkTimeOfDayAnnotation(JavaResourceNode parent, AnnotatedElement element, DeclarationAnnotationAdapter daa) {
-		super(parent, element, daa);
-		this.hourDeclarationAdapter = buildHourAdapter(daa);
-		this.hourAdapter = new AnnotatedElementAnnotationElementAdapter<Integer>(element, this.hourDeclarationAdapter);
-		this.minuteDeclarationAdapter = buildMinuteAdapter(daa);
-		this.minuteAdapter = new AnnotatedElementAnnotationElementAdapter<Integer>(element, this.minuteDeclarationAdapter);
-		this.secondDeclarationAdapter = buildSecondAdapter(daa);
-		this.secondAdapter = new AnnotatedElementAnnotationElementAdapter<Integer>(element, this.secondDeclarationAdapter);
-		this.millisecondDeclarationAdapter = buildMillisecondAdapter(daa);
-		this.millisecondAdapter = new AnnotatedElementAnnotationElementAdapter<Integer>(element, this.millisecondDeclarationAdapter);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.hour = this.buildHour(astRoot);
-		this.minute = this.buildMinute(astRoot);
-		this.second = this.buildSecond(astRoot);
-		this.millisecond = this.buildMillisecond(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncHour(this.buildHour(astRoot));
-		this.syncMinute(this.buildMinute(astRoot));
-		this.syncSecond(this.buildSecond(astRoot));
-		this.syncMillisecond(this.buildMillisecond(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.hour == null) &&
-				(this.minute == null) &&
-				(this.second == null) &&
-				(this.millisecond == null);
-	}
-
-
-	// ********** TimeOfDayAnnotation implementation **********
-
-	// ***** hour
-	public Integer getHour() {
-		return this.hour;
-	}
-
-	public void setHour(Integer hour) {
-		if (this.attributeValueHasChanged(this.hour, hour)) {
-			this.hour = hour;
-			this.hourAdapter.setValue(hour);
-		}
-	}
-
-	private void syncHour(Integer astHour) {
-		Integer old = this.hour;
-		this.hour = astHour;
-		this.firePropertyChanged(HOUR_PROPERTY, old, astHour);
-	}
-
-	private Integer buildHour(CompilationUnit astRoot) {
-		return this.hourAdapter.getValue(astRoot);
-	}
-
-	public TextRange getHourTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.hourDeclarationAdapter, astRoot);
-	}
-
-	// ***** minute
-	public Integer getMinute() {
-		return this.minute;
-	}
-
-	public void setMinute(Integer minute) {
-		if (this.attributeValueHasChanged(this.minute, minute)) {
-			this.minute = minute;
-			this.minuteAdapter.setValue(minute);
-		}
-	}
-
-	private void syncMinute(Integer astMinute) {
-		Integer old = this.minute;
-		this.minute = astMinute;
-		this.firePropertyChanged(MINUTE_PROPERTY, old, astMinute);
-	}
-
-	private Integer buildMinute(CompilationUnit astRoot) {
-		return this.minuteAdapter.getValue(astRoot);
-	}
-
-	public TextRange getMinuteTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.minuteDeclarationAdapter, astRoot);
-	}
-
-	// ***** second
-	public Integer getSecond() {
-		return this.second;
-	}
-
-	public void setSecond(Integer newSecond) {
-		if (this.attributeValueHasChanged(this.second, newSecond)) {
-			this.second = newSecond;
-			this.secondAdapter.setValue(newSecond);
-		}
-	}
-
-	private void syncSecond(Integer astSecond) {
-		Integer old = this.second;
-		this.second = astSecond;
-		this.firePropertyChanged(SECOND_PROPERTY, old, astSecond);
-	}
-
-	private Integer buildSecond(CompilationUnit astRoot) {
-		return this.secondAdapter.getValue(astRoot);
-	}
-
-	public TextRange getSecondTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.secondDeclarationAdapter, astRoot);
-	}
-
-	// ***** millisecond
-	public Integer getMillisecond() {
-		return this.millisecond;
-	}
-
-	public void setMillisecond(Integer millisecond) {
-		if (this.attributeValueHasChanged(this.millisecond, millisecond)) {
-			this.millisecond = millisecond;
-			this.millisecondAdapter.setValue(millisecond);
-		}
-	}
-
-	private void syncMillisecond(Integer astMillisecond) {
-		Integer oldMillisecond = this.millisecond;
-		this.millisecond = astMillisecond;
-		this.firePropertyChanged(MILLISECOND_PROPERTY, oldMillisecond, astMillisecond);
-	}
-
-	private Integer buildMillisecond(CompilationUnit astRoot) {
-		return this.millisecondAdapter.getValue(astRoot);
-	}
-
-	public TextRange getMillisecondTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.millisecondDeclarationAdapter, astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<Integer> buildHourAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(daa, EclipseLink.TIME_OF_DAY__HOUR, NumberIntegerExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<Integer> buildMinuteAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(daa, EclipseLink.TIME_OF_DAY__MINUTE, NumberIntegerExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<Integer> buildSecondAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(daa, EclipseLink.TIME_OF_DAY__SECOND, NumberIntegerExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<Integer> buildMillisecondAdapter(DeclarationAnnotationAdapter daa) {
-		return new ConversionDeclarationAnnotationElementAdapter<Integer>(daa, EclipseLink.TIME_OF_DAY__MILLISECOND, NumberIntegerExpressionConverter.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTransformationAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTransformationAnnotation.java
deleted file mode 100644
index 8f8716947e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTransformationAnnotation.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.BooleanExpressionConverter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.core.resource.java.FetchType;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformationAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.Transformation
- */
-public final class SourceEclipseLinkTransformationAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkTransformationAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> FETCH_ADAPTER = buildFetchAdapter();
-	private final AnnotationElementAdapter<String> fetchAdapter;
-	private FetchType fetch;
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> OPTIONAL_ADAPTER = buildOptionalAdapter();
-	private final AnnotationElementAdapter<Boolean> optionalAdapter;
-	private Boolean optional;
-
-
-	public SourceEclipseLinkTransformationAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.fetchAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, FETCH_ADAPTER);
-		this.optionalAdapter = new AnnotatedElementAnnotationElementAdapter<Boolean>(element, OPTIONAL_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.fetch = this.buildFetch(astRoot);
-		this.optional = this.buildOptional(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncFetch(this.buildFetch(astRoot));
-		this.syncOptional(this.buildOptional(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.fetch == null) &&
-				(this.optional == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.fetch);
-	}
-
-
-	// ********** TransformationAnnotation implementation **********
-
-	// ***** fetch
-	public FetchType getFetch() {
-		return this.fetch;
-	}
-
-	public void setFetch(FetchType fetch) {
-		if (this.attributeValueHasChanged(this.fetch, fetch)) {
-			this.fetch = fetch;
-			this.fetchAdapter.setValue(FetchType.toJavaAnnotationValue(fetch));
-		}
-	}
-
-	private void syncFetch(FetchType astFetch) {
-		FetchType old = this.fetch;
-		this.fetch = astFetch;
-		this.firePropertyChanged(FETCH_PROPERTY, old, astFetch);
-	}
-
-	private FetchType buildFetch(CompilationUnit astRoot) {
-		return FetchType.fromJavaAnnotationValue(this.fetchAdapter.getValue(astRoot));
-	}
-
-	public TextRange getFetchTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(FETCH_ADAPTER, astRoot);
-	}
-
-	// ***** optional
-	public Boolean getOptional() {
-		return this.optional;
-	}
-
-	public void setOptional(Boolean optional) {
-		if (this.attributeValueHasChanged(this.optional, optional)) {
-			this.optional = optional;
-			this.optionalAdapter.setValue(optional);
-		}
-	}
-
-	private void syncOptional(Boolean astOptional) {
-		Boolean old = this.optional;
-		this.optional = astOptional;
-		this.firePropertyChanged(OPTIONAL_PROPERTY, old, astOptional);
-	}
-
-	private Boolean buildOptional(CompilationUnit astRoot) {
-		return this.optionalAdapter.getValue(astRoot);
-	}
-
-	public TextRange getOptionalTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(OPTIONAL_ADAPTER, astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<Boolean> buildOptionalAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.TRANSFORMATION__OPTIONAL, BooleanExpressionConverter.instance());
-	}
-
-	private static DeclarationAnnotationElementAdapter<String> buildFetchAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLink.TRANSFORMATION__FETCH);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTransformerAnnotation.java
deleted file mode 100644
index 9b816106cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTransformerAnnotation.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.ReadTransformer
- * org.eclipse.persistence.annotations.WriteTransformer
- */
-abstract class SourceEclipseLinkTransformerAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkTransformerAnnotation
-{
-	final DeclarationAnnotationElementAdapter<String> transformerClassDeclarationAdapter;
-	final AnnotationElementAdapter<String> transformerClassAdapter;
-	String transformerClass;
-
-	final DeclarationAnnotationElementAdapter<String> methodDeclarationAdapter;
-	final AnnotationElementAdapter<String> methodAdapter;
-	String method;
-
-
-	SourceEclipseLinkTransformerAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element, DeclarationAnnotationAdapter daa) {
-		super(parent, element, daa);
-		this.transformerClassDeclarationAdapter = new ConversionDeclarationAnnotationElementAdapter<String>(daa, this.getTransformerClassElementName(), SimpleTypeStringExpressionConverter.instance());
-		this.transformerClassAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, this.transformerClassDeclarationAdapter);
-
-		this.methodDeclarationAdapter = ConversionDeclarationAnnotationElementAdapter.forStrings(daa, this.getMethodElementName());
-		this.methodAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, this.methodDeclarationAdapter);
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.transformerClass = this.buildTransformerClass(astRoot);
-		this.method = this.buildMethod(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncTransformerClass(this.buildTransformerClass(astRoot));
-		this.syncMethod(this.buildMethod(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.transformerClass == null) &&
-				(this.method == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.transformerClass);
-	}
-
-
-	// ********** TransformerAnnotation implementation **********
-
-	// ***** transformer class
-	public String getTransformerClass() {
-		return this.transformerClass;
-	}
-
-	public void setTransformerClass(String transformerClass) {
-		if (this.attributeValueHasChanged(this.transformerClass, transformerClass)) {
-			this.transformerClass = transformerClass;
-			this.transformerClassAdapter.setValue(transformerClass);
-		}
-	}
-
-	private void syncTransformerClass(String astTransformerClass) {
-		String old = this.transformerClass;
-		this.transformerClass = astTransformerClass;
-		this.firePropertyChanged(TRANSFORMER_CLASS_PROPERTY, old, astTransformerClass);
-	}
-
-	private String buildTransformerClass(CompilationUnit astRoot) {
-		return this.transformerClassAdapter.getValue(astRoot);
-	}
-
-	public TextRange getTransformerClassTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.transformerClassDeclarationAdapter, astRoot);
-	}
-
-	abstract String getTransformerClassElementName();
-
-	// ***** method
-	public String getMethod() {
-		return this.method;
-	}
-
-	public void setMethod(String method) {
-		if (this.attributeValueHasChanged(this.method, method)) {
-			this.method = method;
-			this.methodAdapter.setValue(method);
-		}
-	}
-
-	private void syncMethod(String astMethod) {
-		String old = this.method;
-		this.method = astMethod;
-		this.firePropertyChanged(METHOD_PROPERTY, old, astMethod);
-	}
-
-	private String buildMethod(CompilationUnit astRoot) {
-		return this.methodAdapter.getValue(astRoot);
-	}
-
-	public TextRange getMethodTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.methodDeclarationAdapter, astRoot);
-	}
-
-	abstract String getMethodElementName();
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTypeConverterAnnotation.java
deleted file mode 100644
index de5a00a78c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkTypeConverterAnnotation.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTypeConverterAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.TypeConverter
- */
-public final class SourceEclipseLinkTypeConverterAnnotation
-	extends SourceBaseEclipseLinkTypeConverterAnnotation
-	implements EclipseLinkTypeConverterAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-
-	public SourceEclipseLinkTypeConverterAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-
-	// ********** SourceNamedConverterAnnotation implementation **********
-
-	@Override
-	String getNameElementName() {
-		return EclipseLink.TYPE_CONVERTER__NAME;
-	}
-
-
-	// ********** SourceBaseTypeConverterAnnotation implementation **********
-
-	@Override
-	String getDataTypeElementName() {
-		return EclipseLink.TYPE_CONVERTER__DATA_TYPE;
-	}
-
-	@Override
-	String getObjectTypeElementName() {
-		return EclipseLink.TYPE_CONVERTER__OBJECT_TYPE;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkVariableOneToOneAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkVariableOneToOneAnnotation.java
deleted file mode 100644
index 8e8ee15d3e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkVariableOneToOneAnnotation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkVariableOneToOneAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.VariableOneToOne
- */
-public final class SourceEclipseLinkVariableOneToOneAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkVariableOneToOneAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-
-	public SourceEclipseLinkVariableOneToOneAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		// nothing to initialize
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		// nothing to update
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkWriteTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkWriteTransformerAnnotation.java
deleted file mode 100644
index 7ad33bd164..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/java/source/SourceEclipseLinkWriteTransformerAnnotation.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ElementAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.NestedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.JPA;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.NullEclipseLinkWriteTransformerColumnAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkWriteTransformerAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.WriteTransformer
- */
-public final class SourceEclipseLinkWriteTransformerAnnotation
-	extends SourceEclipseLinkTransformerAnnotation
-	implements EclipseLinkWriteTransformerAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private final ElementAnnotationAdapter columnAdapter;
-	private ColumnAnnotation column;
-	private final ColumnAnnotation nullColumn;
-
-
-	public SourceEclipseLinkWriteTransformerAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.columnAdapter = new ElementAnnotationAdapter(this.annotatedElement, buildColumnAnnotationAdapter(this.daa));
-		this.nullColumn = this.buildNullColumn();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		if (this.columnAdapter.getAnnotation(astRoot) != null) {
-			this.column = createColumn(this, this.annotatedElement, this.daa);
-			this.column.initialize(astRoot);
-		}
-	}
-
-	@Override
-	public void synchronizeWith(CompilationUnit astRoot) {
-		super.synchronizeWith(astRoot);
-		this.syncColumn(astRoot);
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.column == null);
-	}
-
-
-	// ********** SourceTransformerAnnotation implementation **********
-
-	@Override
-	String getTransformerClassElementName() {
-		return EclipseLink.WRITE_TRANSFORMER__TRANSFORMER_CLASS;
-	}
-
-	@Override
-	String getMethodElementName() {
-		return EclipseLink.WRITE_TRANSFORMER__METHOD;
-	}
-
-
-	// ********** WriteTransformerAnnotation implementation **********
-
-	// ***** column
-	public ColumnAnnotation getColumn() {
-		return this.column;
-	}
-
-	public ColumnAnnotation getNonNullColumn() {
-		return (this.column != null) ? this.column : this.nullColumn;
-	}
-
-	public ColumnAnnotation addColumn() {
-		if (this.column != null) {
-			throw new IllegalStateException("'column' element already exists: " + this.column); //$NON-NLS-1$
-		}
-		this.column = createColumn(this, this.annotatedElement, this.daa);
-		this.column.newAnnotation();
-		return this.column;
-	}
-
-	public void removeColumn() {
-		if (this.column == null) {
-			throw new IllegalStateException("'column' element does not exist"); //$NON-NLS-1$
-		}
-		ColumnAnnotation old = this.column;
-		this.column = null;
-		old.removeAnnotation();
-	}
-
-	private void syncColumn(CompilationUnit astRoot) {
-		if (this.columnAdapter.getAnnotation(astRoot) == null) {
-			this.syncColumn_(null);
-		} else {
-			if (this.column == null) {
-				ColumnAnnotation col = createColumn(this, this.annotatedElement, this.daa);
-				col.initialize(astRoot);
-				this.syncColumn_(col);
-			} else {
-				this.column.synchronizeWith(astRoot);
-			}
-		}
-	}
-
-	private void syncColumn_(ColumnAnnotation astColumn) {
-		ColumnAnnotation old = this.column;
-		this.column = astColumn;
-		this.firePropertyChanged(COLUMN_PROPERTY, old, astColumn);
-	}
-
-	private ColumnAnnotation buildNullColumn() {
-		return new NullEclipseLinkWriteTransformerColumnAnnotation(this);
-	}
-
-	public TextRange getColumnTextRange(CompilationUnit astRoot) {
-		if (this.column != null) {
-			return this.column.getTextRange(astRoot);
-		}
-		return getTextRange(astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationAdapter buildColumnAnnotationAdapter(DeclarationAnnotationAdapter writeTransformerAnnotationAdapter) {
-		return new NestedDeclarationAnnotationAdapter(writeTransformerAnnotationAdapter, EclipseLink.WRITE_TRANSFORMER__COLUMN, JPA.COLUMN);
-	}
-
-	private static ColumnAnnotation createColumn(JavaResourceNode parent, AnnotatedElement element, DeclarationAnnotationAdapter writeTransformerAnnotationAdapter) {
-		return new SourceColumnAnnotation(parent, element, buildColumnAnnotationAdapter(writeTransformerAnnotationAdapter));
-	}
-
-}
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
deleted file mode 100644
index d327917afe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/resource/orm/EclipseLinkOrmXmlResourceProvider.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.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.jpa.core.internal.operations.OrmFileCreationDataModelProperties;
-import org.eclipse.jpt.jpa.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt.jpa.core.resource.orm.AccessType;
-import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
-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.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EclipseLinkOrmXmlResourceProvider
-	extends AbstractXmlResourceProvider
-	implements OrmFileCreationDataModelProperties
-{
-	/**
-	 * (Convenience method) Returns an EclipseLink ORM resource model provider for 
-	 * the given file.
-	 */
-	public static EclipseLinkOrmXmlResourceProvider getXmlResourceProvider(IFile file) {
-		return getXmlResourceProvider_(file.getProject(), file.getFullPath());
-	}
-	
-	/**
-	 * (Convenience method) Returns an EclipseLink ORM resource model provider for
-	 * the given project in the specified runtime location
-	 */
-	public static EclipseLinkOrmXmlResourceProvider getXmlResourceProvider(IProject project, IPath runtimePath) {
-		return getXmlResourceProvider_(project, runtimePath);
-	}
-	
-	/**
-	 * (Convenience method) Returns an EclipseLink ORM resource model provider for 
-	 * the given project in the default runtime location
-	 */
-	public static EclipseLinkOrmXmlResourceProvider getDefaultXmlResourceProvider(IProject project) {
-		return getXmlResourceProvider(project, JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH);
-	}
-	
-	private static EclipseLinkOrmXmlResourceProvider getXmlResourceProvider_(IProject project, IPath fullPath) {
-		return new EclipseLinkOrmXmlResourceProvider(project, fullPath);
-	}
-	
-	
-	public EclipseLinkOrmXmlResourceProvider(IProject project) {
-		this(project, JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH);
-	}
-	
-	public EclipseLinkOrmXmlResourceProvider(IProject project, IPath filePath) {
-		super(project, filePath, JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
-	}
-	
-	
-	@Override
-	protected void populateRoot(Object config) {
-		IDataModel dataModel = (IDataModel) config;
-		XmlEntityMappings entityMappings = EclipseLinkOrmFactory.eINSTANCE.createXmlEntityMappings();
-		entityMappings.setVersion(dataModel.getStringProperty(VERSION));
-		getResourceContents().add(entityMappings);
-		
-		AccessType defaultAccess = (AccessType) dataModel.getProperty(DEFAULT_ACCESS); 
-		if (defaultAccess != null) {
-			XmlPersistenceUnitMetadata puMetadata = EclipseLinkOrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata();
-			entityMappings.setPersistenceUnitMetadata(puMetadata);
-			XmlPersistenceUnitDefaults puDefaults = OrmFactory.eINSTANCE.createXmlPersistenceUnitDefaults();
-			puMetadata.setPersistenceUnitDefaults(puDefaults);
-			puDefaults.setAccess(defaultAccess);
-		}
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java
deleted file mode 100644
index 6120db82f4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v1_1;
-
-import org.eclipse.jpt.common.core.AnnotationProvider;
-import org.eclipse.jpt.jpa.core.JpaFacet;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
-import org.eclipse.jpt.jpa.core.JpaPlatformFactory;
-import org.eclipse.jpt.jpa.core.JpaPlatformVariation;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkVersion;
-
-/**
- * All the state in the JPA platform should be "static" (i.e. unchanging once
- * it is initialized).
- */
-public class EclipseLink1_1JpaPlatformFactory
-	implements JpaPlatformFactory
-{
-	/**
-	 * zero-argument constructor
-	 */
-	public EclipseLink1_1JpaPlatformFactory() {
-		super();
-	}
-	
-	
-	public JpaPlatform buildJpaPlatform(String id) {
-		return new GenericJpaPlatform(
-			id,
-			buildJpaVersion(),
-			new EclipseLinkJpaFactory(), 
-			buildAnnotationProvider(),
-			EclipseLink1_1JpaPlatformProvider.instance(), 
-			buildJpaPlatformVariation());
-	}
-	
-	protected AnnotationProvider buildAnnotationProvider() {
-		return new JpaAnnotationProvider(
-			GenericJpaAnnotationDefinitionProvider.instance(),
-			EclipseLinkJpaAnnotationDefinitionProvider.instance());
-	}
-	
-	protected JpaPlatformVariation buildJpaPlatformVariation() {
-		return new JpaPlatformVariation() {
-			public Supported getTablePerConcreteClassInheritanceIsSupported() {
-				return Supported.YES;
-			}
-			public boolean isJoinTableOverridable() {
-				return false;
-			}
-		};
-	}
-	
-	private JpaPlatform.Version buildJpaVersion() {
-		return new EclipseLinkVersion(
-				JptJpaEclipseLinkCorePlugin.ECLIPSELINK_PLATFORM_VERSION_1_1,
-				JpaFacet.VERSION_1_0.getVersionString());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformProvider.java
deleted file mode 100644
index 88ecb34718..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformProvider.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v1_1;
-
-import java.util.ArrayList;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptCommonCorePlugin;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.JpaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.ResourceDefinition;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.internal.JarResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkOrmResourceModelProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicCollectionMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMapMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEmbeddableDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEntityDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaIdMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaManyToManyMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaManyToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaMappedSuperclassDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaTransformationMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaVariableOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaVersionMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v1_1.context.orm.EclipseLinkOrmXml1_1Definition;
-
-/**
- * EclipseLink platform
- */
-public class EclipseLink1_1JpaPlatformProvider
-		extends AbstractJpaPlatformProvider {
-	
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLink1_1JpaPlatformProvider();
-
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink1_1JpaPlatformProvider() {
-		super();
-	}
-
-
-	// ********** resource models **********
-
-	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
-		if (contentType.equals(JptCommonCorePlugin.JAVA_SOURCE_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAVA_SOURCE_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptCommonCorePlugin.JAR_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAR_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaCorePlugin.PERSISTENCE_XML_CONTENT_TYPE)) {
-			return JptJpaCorePlugin.PERSISTENCE_XML_1_0_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaCorePlugin.ORM_XML_CONTENT_TYPE)) {
-			return JptJpaCorePlugin.ORM_XML_1_0_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_1_1_RESOURCE_TYPE;
-		}
-		else {
-			throw new IllegalArgumentException(contentType.toString());
-		}
-	}
-
-	@Override
-	protected void addResourceModelProvidersTo(ArrayList<JpaResourceModelProvider> providers) {
-		CollectionTools.addAll(providers, RESOURCE_MODEL_PROVIDERS);
-	}
-
-	// order should not be important here
-	protected static final JpaResourceModelProvider[] RESOURCE_MODEL_PROVIDERS = new JpaResourceModelProvider[] {
-		JavaResourceModelProvider.instance(),
-		JarResourceModelProvider.instance(),
-		PersistenceResourceModelProvider.instance(),
-		OrmResourceModelProvider.instance(),
-		EclipseLinkOrmResourceModelProvider.instance()
-	};
-
-
-	// ********* Java type mappings *********
-
-	@Override
-	protected void addJavaTypeMappingDefinitionsTo(ArrayList<JavaTypeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, JAVA_TYPE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no EclipseLink-specific mappings
-	protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] {
-		EclipseLinkJavaEntityDefinition.instance(),
-		EclipseLinkJavaEmbeddableDefinition.instance(),
-		EclipseLinkJavaMappedSuperclassDefinition.instance()
-	};
-
-
-	// ********* Java attribute mappings *********
-
-	@Override
-	protected void addDefaultJavaAttributeMappingDefinitionsTo(ArrayList<DefaultJavaAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no change from EclipseLink 1.0 to 1.1
-	protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] {
-		JavaEmbeddedMappingDefinition.instance(),
-		EclipseLinkJavaOneToManyMappingDefinition.instance(),
-		EclipseLinkJavaOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaVariableOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaBasicMappingDefinition.instance()
-	};
-
-	@Override
-	protected void addSpecifiedJavaAttributeMappingDefinitionsTo(ArrayList<JavaAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no change from EclipseLink 1.0 to 1.1
-	protected static final JavaAttributeMappingDefinition[] SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new JavaAttributeMappingDefinition[] {
-		JavaTransientMappingDefinition.instance(),
-		EclipseLinkJavaBasicCollectionMappingDefinition.instance(),
-		EclipseLinkJavaBasicMapMappingDefinition.instance(),
-		EclipseLinkJavaIdMappingDefinition.instance(),
-		EclipseLinkJavaVersionMappingDefinition.instance(),
-		EclipseLinkJavaBasicMappingDefinition.instance(),
-		JavaEmbeddedMappingDefinition.instance(),
-		JavaEmbeddedIdMappingDefinition.instance(),
-		EclipseLinkJavaTransformationMappingDefinition.instance(),
-		EclipseLinkJavaManyToManyMappingDefinition.instance(),
-		EclipseLinkJavaManyToOneMappingDefinition.instance(),
-		EclipseLinkJavaOneToManyMappingDefinition.instance(),
-		EclipseLinkJavaOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaVariableOneToOneMappingDefinition.instance()
-	};
-
-
-	// ********** resource definitions **********
-
-	@Override
-	protected void addResourceDefinitionsTo(ArrayList<ResourceDefinition> definitions) {
-		CollectionTools.addAll(definitions, RESOURCE_DEFINITIONS);
-	}
-
-	protected static final ResourceDefinition[] RESOURCE_DEFINITIONS = new ResourceDefinition[] {
-		EclipseLinkPersistenceXmlDefinition.instance(),
-		GenericOrmXmlDefinition.instance(),
-		EclipseLinkOrmXmlDefinition.instance(),
-		EclipseLinkOrmXml1_1Definition.instance()
-	};
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/context/orm/EclipseLinkOrmXml1_1Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/context/orm/EclipseLinkOrmXml1_1Definition.java
deleted file mode 100644
index fe698c9726..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_1/context/orm/EclipseLinkOrmXml1_1Definition.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v1_1.context.orm;
-
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.AbstractEclipseLinkOrmXmlDefinition;
-
-public class EclipseLinkOrmXml1_1Definition
-	extends AbstractEclipseLinkOrmXmlDefinition
-{
-	// singleton
-	private static final OrmXmlDefinition INSTANCE = new EclipseLinkOrmXml1_1Definition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmXmlDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkOrmXml1_1Definition() {
-		super();
-	}
-	public JptResourceType getResourceType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_1_1_RESOURCE_TYPE;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaAnnotationDefinitionProvider.java
deleted file mode 100644
index 4a6f099407..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaAnnotationDefinitionProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v1_2;
-
-import java.util.ArrayList;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.Access2_0AnnotationDefinition;
-
-/**
- * Provides annotations for 1.2 EclipseLink platform
- */
-public class EclipseLink1_2JpaAnnotationDefinitionProvider
-	extends AbstractJpaAnnotationDefinitionProvider
-{
-	// singleton
-	private static final JpaAnnotationDefinitionProvider INSTANCE = new EclipseLink1_2JpaAnnotationDefinitionProvider();
-
-	/**
-	 * Return the singleton
-	 */
-	public static JpaAnnotationDefinitionProvider instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink1_2JpaAnnotationDefinitionProvider() {
-		super();
-	}
-
-	@Override
-	protected void addAnnotationDefinitionsTo(ArrayList<AnnotationDefinition> definitions) {
-		definitions.add(Access2_0AnnotationDefinition.instance());
-	}
-
-	@Override
-	protected void addNestableAnnotationDefinitionsTo(ArrayList<NestableAnnotationDefinition> definitions) {
-		// nothing new for EclipseLink 1.2
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaPlatformFactory.java
deleted file mode 100644
index bb32aba60c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaPlatformFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v1_2;
-
-import org.eclipse.jpt.common.core.AnnotationProvider;
-import org.eclipse.jpt.jpa.core.JpaFacet;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
-import org.eclipse.jpt.jpa.core.JpaPlatformFactory;
-import org.eclipse.jpt.jpa.core.JpaPlatformVariation;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkVersion;
-
-/**
- * All the state in the JPA platform should be "static" (i.e. unchanging once
- * it is initialized).
- */
-public class EclipseLink1_2JpaPlatformFactory
-	implements JpaPlatformFactory
-{
-	/**
-	 * zero-argument constructor
-	 */
-	public EclipseLink1_2JpaPlatformFactory() {
-		super();
-	}
-	
-	
-	public JpaPlatform buildJpaPlatform(String id) {
-		return new GenericJpaPlatform(
-			id,
-			buildJpaVersion(),
-			new EclipseLinkJpaFactory(), 
-			buildAnnotationProvider(),
-			EclipseLink1_2JpaPlatformProvider.instance(), 
-			buildJpaPlatformVariation());
-	}
-	
-	protected AnnotationProvider buildAnnotationProvider() {
-		return new JpaAnnotationProvider(
-			GenericJpaAnnotationDefinitionProvider.instance(),
-			EclipseLinkJpaAnnotationDefinitionProvider.instance(),
-			EclipseLink1_2JpaAnnotationDefinitionProvider.instance());
-	}
-	
-	protected JpaPlatformVariation buildJpaPlatformVariation() {
-		return new JpaPlatformVariation() {
-			public Supported getTablePerConcreteClassInheritanceIsSupported() {
-				return Supported.YES;
-			}
-			public boolean isJoinTableOverridable() {
-				return false;
-			}
-		};
-	}
-	
-	private JpaPlatform.Version buildJpaVersion() {
-		return new EclipseLinkVersion(
-				JptJpaEclipseLinkCorePlugin.ECLIPSELINK_PLATFORM_VERSION_1_2,
-				JpaFacet.VERSION_1_0.getVersionString());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaPlatformProvider.java
deleted file mode 100644
index 74abe1d5a1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/EclipseLink1_2JpaPlatformProvider.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v1_2;
-
-import java.util.ArrayList;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptCommonCorePlugin;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.JpaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.ResourceDefinition;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.internal.JarResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkOrmResourceModelProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicCollectionMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMapMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEmbeddableDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEntityDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaIdMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaManyToManyMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaManyToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaMappedSuperclassDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaTransformationMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaVariableOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaVersionMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v1_1.context.orm.EclipseLinkOrmXml1_1Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v1_2.context.orm.EclipseLinkOrmXml1_2Definition;
-
-/**
- * EclipseLink platform
- */
-public class EclipseLink1_2JpaPlatformProvider
-		extends AbstractJpaPlatformProvider {
-	
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLink1_2JpaPlatformProvider();
-
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink1_2JpaPlatformProvider() {
-		super();
-	}
-
-
-	// ********** resource models **********
-
-	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
-		if (contentType.equals(JptCommonCorePlugin.JAVA_SOURCE_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAVA_SOURCE_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptCommonCorePlugin.JAR_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAR_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaCorePlugin.PERSISTENCE_XML_CONTENT_TYPE)) {
-			return JptJpaCorePlugin.PERSISTENCE_XML_1_0_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaCorePlugin.ORM_XML_CONTENT_TYPE)) {
-			return JptJpaCorePlugin.ORM_XML_1_0_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_1_2_RESOURCE_TYPE;
-		}
-		else {
-			throw new IllegalArgumentException(contentType.toString());
-		}
-	}
-
-	@Override
-	protected void addResourceModelProvidersTo(ArrayList<JpaResourceModelProvider> providers) {
-		CollectionTools.addAll(providers, RESOURCE_MODEL_PROVIDERS);
-	}
-
-	// order should not be important here
-	protected static final JpaResourceModelProvider[] RESOURCE_MODEL_PROVIDERS = new JpaResourceModelProvider[] {
-		JavaResourceModelProvider.instance(),
-		JarResourceModelProvider.instance(),
-		PersistenceResourceModelProvider.instance(),
-		OrmResourceModelProvider.instance(),
-		EclipseLinkOrmResourceModelProvider.instance()
-	};
-
-
-	// ********* Java type mappings *********
-
-	@Override
-	protected void addJavaTypeMappingDefinitionsTo(ArrayList<JavaTypeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, JAVA_TYPE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no EclipseLink-specific mappings
-	protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] {
-		EclipseLinkJavaEntityDefinition.instance(),
-		EclipseLinkJavaEmbeddableDefinition.instance(),
-		EclipseLinkJavaMappedSuperclassDefinition.instance()
-	};
-
-
-	// ********* Java attribute mappings *********
-
-	@Override
-	protected void addDefaultJavaAttributeMappingDefinitionsTo(ArrayList<DefaultJavaAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no change from EclipseLink 1.1 to 1.2
-	protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] {
-		JavaEmbeddedMappingDefinition.instance(),
-		EclipseLinkJavaOneToManyMappingDefinition.instance(),
-		EclipseLinkJavaOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaVariableOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaBasicMappingDefinition.instance()
-	};
-
-	@Override
-	protected void addSpecifiedJavaAttributeMappingDefinitionsTo(ArrayList<JavaAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no change from EclipseLink 1.1 to 1.2
-	protected static final JavaAttributeMappingDefinition[] SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new JavaAttributeMappingDefinition[] {
-		JavaTransientMappingDefinition.instance(),
-		EclipseLinkJavaBasicCollectionMappingDefinition.instance(),
-		EclipseLinkJavaBasicMapMappingDefinition.instance(),
-		EclipseLinkJavaIdMappingDefinition.instance(),
-		EclipseLinkJavaVersionMappingDefinition.instance(),
-		JavaBasicMappingDefinition.instance(),
-		JavaEmbeddedMappingDefinition.instance(),
-		JavaEmbeddedIdMappingDefinition.instance(),
-		EclipseLinkJavaTransformationMappingDefinition.instance(),
-		EclipseLinkJavaManyToManyMappingDefinition.instance(),
-		EclipseLinkJavaManyToOneMappingDefinition.instance(),
-		EclipseLinkJavaOneToManyMappingDefinition.instance(),
-		EclipseLinkJavaOneToOneMappingDefinition.instance(),
-		EclipseLinkJavaVariableOneToOneMappingDefinition.instance()
-	};
-
-
-	// ********** resource definitions **********
-
-	@Override
-	protected void addResourceDefinitionsTo(ArrayList<ResourceDefinition> definitions) {
-		CollectionTools.addAll(definitions, RESOURCE_DEFINITIONS);
-	}
-
-	protected static final ResourceDefinition[] RESOURCE_DEFINITIONS = new ResourceDefinition[] {
-		EclipseLinkPersistenceXmlDefinition.instance(),
-		GenericOrmXmlDefinition.instance(),
-		EclipseLinkOrmXmlDefinition.instance(),
-		EclipseLinkOrmXml1_1Definition.instance(),
-		EclipseLinkOrmXml1_2Definition.instance()
-	};
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/context/orm/EclipseLinkOrmXml1_2Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/context/orm/EclipseLinkOrmXml1_2Definition.java
deleted file mode 100644
index c2f7a88c9c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v1_2/context/orm/EclipseLinkOrmXml1_2Definition.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v1_2.context.orm;
-
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.AbstractEclipseLinkOrmXmlDefinition;
-
-public class EclipseLinkOrmXml1_2Definition
-	extends AbstractEclipseLinkOrmXmlDefinition
-{
-	// singleton
-	private static final OrmXmlDefinition INSTANCE = new EclipseLinkOrmXml1_2Definition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmXmlDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkOrmXml1_2Definition() {
-		super();
-	}
-
-	public JptResourceType getResourceType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_1_2_RESOURCE_TYPE;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/AbstractEclipseLink2_0JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/AbstractEclipseLink2_0JpaPlatformProvider.java
deleted file mode 100644
index e5695ac657..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/AbstractEclipseLink2_0JpaPlatformProvider.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-*
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0;
-
-import java.util.ArrayList;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptCommonCorePlugin;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.ResourceDefinition;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.internal.JarResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaEmbeddedIdMappingDefinition2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaEmbeddedMappingDefinition2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_0Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkOrmResourceModelProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v1_1.context.orm.EclipseLinkOrmXml1_1Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v1_2.context.orm.EclipseLinkOrmXml1_2Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaBasicCollectionMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaBasicMapMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaBasicMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaElementCollectionMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaEmbeddableDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaEntityDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaIdMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaManyToManyMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaManyToOneMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaMappedSuperclassDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaOneToManyMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaOneToOneMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaTransformationMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaVariableOneToOneMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaVersionMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.orm.EclipseLinkOrmXml2_0Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence.EclipseLink2_0PersistenceXmlDefinition;
-
-/**
- *  EclipseLink 2.0 platform config
- */
-public abstract class AbstractEclipseLink2_0JpaPlatformProvider
-	extends AbstractJpaPlatformProvider
-{
-	protected AbstractEclipseLink2_0JpaPlatformProvider() {
-		super();
-	}
-
-
-	// ********** resource models **********
-
-	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
-		if (contentType.equals(JptCommonCorePlugin.JAVA_SOURCE_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAVA_SOURCE_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptCommonCorePlugin.JAR_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAR_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaCorePlugin.PERSISTENCE_XML_CONTENT_TYPE)) {
-			return JptJpaCorePlugin.PERSISTENCE_XML_2_0_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaCorePlugin.ORM_XML_CONTENT_TYPE)) {
-			return JptJpaCorePlugin.ORM_XML_2_0_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_0_RESOURCE_TYPE;
-		}
-		else {
-			throw new IllegalArgumentException(contentType.toString());
-		}
-	}
-
-	@Override
-	protected void addResourceModelProvidersTo(ArrayList<JpaResourceModelProvider> providers) {
-		CollectionTools.addAll(providers, RESOURCE_MODEL_PROVIDERS);
-	}
-
-	// order should not be important here
-	protected static final JpaResourceModelProvider[] RESOURCE_MODEL_PROVIDERS = new JpaResourceModelProvider[] {
-		JavaResourceModelProvider.instance(),
-		JarResourceModelProvider.instance(),
-		PersistenceResourceModelProvider.instance(),
-		OrmResourceModelProvider.instance(),
-		EclipseLinkOrmResourceModelProvider.instance()
-	};
-
-
-	// ********* Java type mappings *********
-
-	@Override
-	protected void addJavaTypeMappingDefinitionsTo(ArrayList<JavaTypeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, JAVA_TYPE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no EclipseLink-specific mappings
-	protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] {
-		EclipseLinkJavaEntityDefinition2_0.instance(),
-		EclipseLinkJavaEmbeddableDefinition2_0.instance(),
-		EclipseLinkJavaMappedSuperclassDefinition2_0.instance()
-	};
-
-
-	// ********* Java attribute mappings *********
-
-	@Override
-	protected void addDefaultJavaAttributeMappingDefinitionsTo(ArrayList<DefaultJavaAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no change from EclipseLink 1.2 to 2.0
-	protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] {
-		JavaEmbeddedMappingDefinition2_0.instance(),
-		EclipseLinkJavaOneToManyMappingDefinition2_0.instance(),
-		EclipseLinkJavaOneToOneMappingDefinition2_0.instance(),
-		EclipseLinkJavaVariableOneToOneMappingDefinition2_0.instance(),
-		EclipseLinkJavaBasicMappingDefinition2_0.instance()
-	};
-
-	@Override
-	protected void addSpecifiedJavaAttributeMappingDefinitionsTo(ArrayList<JavaAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	protected static final JavaAttributeMappingDefinition[] SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new JavaAttributeMappingDefinition[] {
-		JavaTransientMappingDefinition.instance(),
-		EclipseLinkJavaBasicCollectionMappingDefinition2_0.instance(),
-		EclipseLinkJavaBasicMapMappingDefinition2_0.instance(),
-		EclipseLinkJavaElementCollectionMappingDefinition2_0.instance(),
-		EclipseLinkJavaIdMappingDefinition2_0.instance(),
-		EclipseLinkJavaVersionMappingDefinition2_0.instance(),
-		EclipseLinkJavaBasicMappingDefinition2_0.instance(),
-		JavaEmbeddedMappingDefinition2_0.instance(),
-		JavaEmbeddedIdMappingDefinition2_0.instance(),
-		EclipseLinkJavaTransformationMappingDefinition2_0.instance(),
-		EclipseLinkJavaManyToManyMappingDefinition2_0.instance(),
-		EclipseLinkJavaManyToOneMappingDefinition2_0.instance(),
-		EclipseLinkJavaOneToManyMappingDefinition2_0.instance(),
-		EclipseLinkJavaOneToOneMappingDefinition2_0.instance(),
-		EclipseLinkJavaVariableOneToOneMappingDefinition2_0.instance()
-	};
-
-
-	// ********** resource definitions **********
-
-	@Override
-	protected void addResourceDefinitionsTo(ArrayList<ResourceDefinition> definitions) {
-		CollectionTools.addAll(definitions, RESOURCE_DEFINITIONS);
-	}
-
-	protected static final ResourceDefinition[] RESOURCE_DEFINITIONS = new ResourceDefinition[] {
-		EclipseLinkPersistenceXmlDefinition.instance(),
-		EclipseLink2_0PersistenceXmlDefinition.instance(),
-		GenericOrmXmlDefinition.instance(),
-		GenericOrmXml2_0Definition.instance(),
-		EclipseLinkOrmXmlDefinition.instance(),
-		EclipseLinkOrmXml1_1Definition.instance(),
-		EclipseLinkOrmXml1_2Definition.instance(),
-		EclipseLinkOrmXml2_0Definition.instance()
-	};
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaAnnotationDefinitionProvider.java
deleted file mode 100644
index fec4838668..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaAnnotationDefinitionProvider.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0;
-
-import java.util.ArrayList;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicCollectionAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicMapAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCacheAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkChangeTrackingAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConvertAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCustomizerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkExistenceCheckingAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkJoinFetchAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMutableAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrimaryKeyAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrivateOwnedAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadOnlyAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadTransformerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTransformationAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkVariableOneToOneAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkWriteTransformerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.resource.java.EclipseLinkMapKeyConvert2_0AnnotationDefinition;
-
-/**
- * Provides annotations for 2.0 EclipseLink platform
- */
-public class EclipseLink2_0JpaAnnotationDefinitionProvider
-	extends AbstractJpaAnnotationDefinitionProvider
-{
-	// singleton
-	private static final JpaAnnotationDefinitionProvider INSTANCE = new EclipseLink2_0JpaAnnotationDefinitionProvider();
-
-	/**
-	 * Return the singleton
-	 */
-	public static JpaAnnotationDefinitionProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink2_0JpaAnnotationDefinitionProvider() {
-		super();
-	}
-
-	@Override
-	protected void addAnnotationDefinitionsTo(ArrayList<AnnotationDefinition> definitions) {
-		CollectionTools.addAll(definitions, ANNOTATION_DEFINITIONS);
-	}
-
-	protected static final AnnotationDefinition[] ANNOTATION_DEFINITIONS = new AnnotationDefinition[] {
-		EclipseLinkBasicCollectionAnnotationDefinition.instance(),
-		EclipseLinkBasicMapAnnotationDefinition.instance(),
-		EclipseLinkCacheAnnotationDefinition.instance(),
-		EclipseLinkChangeTrackingAnnotationDefinition.instance(),
-		EclipseLinkConvertAnnotationDefinition.instance(),
-		EclipseLinkConverterAnnotationDefinition.instance(),
-		EclipseLinkCustomizerAnnotationDefinition.instance(),
-		EclipseLinkExistenceCheckingAnnotationDefinition.instance(),
-		EclipseLinkJoinFetchAnnotationDefinition.instance(),
-		EclipseLinkMapKeyConvert2_0AnnotationDefinition.instance(),
-		EclipseLinkMutableAnnotationDefinition.instance(),
-		EclipseLinkObjectTypeConverterAnnotationDefinition.instance(),
-		EclipseLinkPrimaryKeyAnnotationDefinition.instance(),
-		EclipseLinkPrivateOwnedAnnotationDefinition.instance(),
-		EclipseLinkReadOnlyAnnotationDefinition.instance(),
-		EclipseLinkReadTransformerAnnotationDefinition.instance(),
-		EclipseLinkStructConverterAnnotationDefinition.instance(),
-		EclipseLinkTransformationAnnotationDefinition.instance(),
-		EclipseLinkTypeConverterAnnotationDefinition.instance(),
-		EclipseLinkVariableOneToOneAnnotationDefinition.instance(),
-		EclipseLinkWriteTransformerAnnotationDefinition.instance()
-	};
-
-	@Override
-	protected void addNestableAnnotationDefinitionsTo(ArrayList<NestableAnnotationDefinition> definitions) {
-		// nothing new for EclipseLink 2.0
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaFactory.java
deleted file mode 100644
index 4cb95e868e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaFactory.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0;
-
-import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
-import org.eclipse.jpt.jpa.core.JpaDataSource;
-import org.eclipse.jpt.jpa.core.JpaProject.Config;
-import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.Table;
-import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaColumn;
-import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
-import org.eclipse.jpt.jpa.core.context.java.JavaNamedQuery;
-import org.eclipse.jpt.jpa.core.context.java.JavaOrderable;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
-import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn;
-import org.eclipse.jpt.jpa.core.context.java.JavaSequenceGenerator;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaAssociationOverrideContainer;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaColumn;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaOrderable;
-import org.eclipse.jpt.jpa.core.internal.jpa2.GenericJpaDatabaseIdentifierAdapter;
-import org.eclipse.jpt.jpa.core.internal.jpa2.GenericMetamodelSynchronizer;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaCacheable2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaCollectionTable2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaDerivedIdentity2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaNamedQuery2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaOrderColumn2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaOrphanRemoval2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaPersistentType2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaSequenceGenerator2_0;
-import org.eclipse.jpt.jpa.core.jpa2.JpaFactory2_0;
-import org.eclipse.jpt.jpa.core.jpa2.JpaProject2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelSourceType;
-import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0.Owner;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionTable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaEmbeddedMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderColumn2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovalHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSingleRelationshipMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.NamedQuery2_0Annotation;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.SequenceGenerator2_0Annotation;
-import org.eclipse.jpt.jpa.core.resource.java.NamedQueryAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.SequenceGeneratorAnnotation;
-import org.eclipse.jpt.jpa.db.DatabaseIdentifierAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkJpaProject;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.JavaEclipseLinkElementCollectionMapping2_0;
-
-/**
- *  EclipseLink 2.0 factory
- */
-public class EclipseLink2_0JpaFactory
-	extends EclipseLinkJpaFactory
-	implements JpaFactory2_0
-{
-	public EclipseLink2_0JpaFactory() {
-		super();
-	}
-	
-	
-	// ********** Core Model **********
-	
-	@Override
-	public EclipseLinkJpaProject buildJpaProject(Config config) {
-		if ( ! (config instanceof JpaProject2_0.Config)) {
-			throw new IllegalArgumentException("config must be 2.0-compatible: " + config); //$NON-NLS-1$
-		}
-		return super.buildJpaProject(config);
-	}
-	
-	public MetamodelSourceType.Synchronizer buildMetamodelSynchronizer(MetamodelSourceType sourceType) {
-		return new GenericMetamodelSynchronizer(sourceType);
-	}
-	
-	public DatabaseIdentifierAdapter buildDatabaseIdentifierAdapter(JpaDataSource dataSource) {
-		return new GenericJpaDatabaseIdentifierAdapter(dataSource);
-	}
-	
-
-	// ********** Java Context Model **********
-
-	@Override
-	public JavaPersistentType buildJavaPersistentType(PersistentType.Owner owner, JavaResourceType jrt) {
-		return new GenericJavaPersistentType2_0(owner, jrt);
-	}
-	
-	@Override
-	public JavaSequenceGenerator buildJavaSequenceGenerator(JavaJpaContextNode parent, SequenceGeneratorAnnotation annotation) {
-		return new GenericJavaSequenceGenerator2_0(parent, (SequenceGenerator2_0Annotation) annotation);
-	}
-
-	//The 2.0 JPA spec supports association overrides on an embedded mapping while the 1.0 spec did not
-	public JavaAssociationOverrideContainer buildJavaAssociationOverrideContainer(JavaEmbeddedMapping2_0 parent, JavaAssociationOverrideContainer.Owner owner) {
-		return new GenericJavaAssociationOverrideContainer(parent, owner);
-	}
-	
-	public JavaDerivedIdentity2_0 buildJavaDerivedIdentity(JavaSingleRelationshipMapping2_0 parent) {
-		return new GenericJavaDerivedIdentity2_0(parent);
-	}
-	
-	public JavaElementCollectionMapping2_0 buildJavaElementCollectionMapping2_0(JavaPersistentAttribute parent) {
-		return new JavaEclipseLinkElementCollectionMapping2_0(parent);
-	}
-	
-	public JavaCacheable2_0 buildJavaCacheable(JavaCacheableHolder2_0 parent) {
-		return new GenericJavaCacheable2_0(parent);
-	}
-	
-	public JavaOrphanRemovable2_0 buildJavaOrphanRemoval(JavaOrphanRemovalHolder2_0 parent) {
-		return new GenericJavaOrphanRemoval2_0(parent);
-	}
-
-	@Override
-	public JavaNamedQuery buildJavaNamedQuery(JavaJpaContextNode parent, NamedQueryAnnotation annotation) {
-		return new GenericJavaNamedQuery2_0(parent, (NamedQuery2_0Annotation) annotation);
-	}
-
-	public JavaCollectionTable2_0 buildJavaCollectionTable(JavaElementCollectionMapping2_0 parent, Table.Owner owner) {
-		return new GenericJavaCollectionTable2_0(parent, owner);
-	}
-
-	public JavaOrderColumn2_0 buildJavaOrderColumn(JavaOrderable2_0 parent, JavaReadOnlyNamedColumn.Owner owner) {
-		return new GenericJavaOrderColumn2_0(parent, owner);
-	}
-
-	public JavaColumn buildJavaMapKeyColumn(JavaJpaContextNode parent, JavaColumn.Owner owner) {
-		return new GenericJavaColumn(parent, owner);
-	}
-
-	public JavaOrderable2_0 buildJavaOrderable(JavaAttributeMapping parent, Owner owner) {
-		return new GenericJavaOrderable(parent, owner);
-	}
-
-	@Override
-	public JavaOrderable buildJavaOrderable(JavaAttributeMapping parent) {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformFactory.java
deleted file mode 100644
index 021e0c7e4f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0;
-
-import org.eclipse.jpt.common.core.AnnotationProvider;
-import org.eclipse.jpt.jpa.core.JpaFacet;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
-import org.eclipse.jpt.jpa.core.JpaPlatformFactory;
-import org.eclipse.jpt.jpa.core.JpaPlatformVariation;
-import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
-import org.eclipse.jpt.jpa.core.internal.jpa2.Generic2_0JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkVersion;
-
-/**
- * All the state in the JPA platform should be "static" (i.e. unchanging once
- * it is initialized).
- */
-public class EclipseLink2_0JpaPlatformFactory
-	implements JpaPlatformFactory
-{
-	/**
-	 * zero-argument constructor
-	 */
-	public EclipseLink2_0JpaPlatformFactory() {
-		super();
-	}
-
-	public JpaPlatform buildJpaPlatform(String id) {
-		return new GenericJpaPlatform(
-			id,
-			buildJpaVersion(),
-			new EclipseLink2_0JpaFactory(), 
-			this.buildAnnotationProvider(),
-			EclipseLink2_0JpaPlatformProvider.instance(), 
-			this.buildJpaVariation());
-	}
-	
-	protected JpaPlatform.Version buildJpaVersion() {
-		return new EclipseLinkVersion(
-				JptJpaEclipseLinkCorePlugin.ECLIPSELINK_PLATFORM_VERSION_2_0,
-				JpaFacet.VERSION_2_0.getVersionString());
-	}
-	
-	protected AnnotationProvider buildAnnotationProvider() {
-		return new JpaAnnotationProvider(
-			Generic2_0JpaAnnotationDefinitionProvider.instance(),
-			EclipseLink2_0JpaAnnotationDefinitionProvider.instance());
-	}
-
-	protected JpaPlatformVariation buildJpaVariation() {
-		return new JpaPlatformVariation() {
-			public Supported getTablePerConcreteClassInheritanceIsSupported() {
-				return Supported.YES;
-			}
-			public boolean isJoinTableOverridable() {
-				return true;
-			}
-		};
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformProvider.java
deleted file mode 100644
index e1b9dd89ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009, 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-*
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0;
-
-import org.eclipse.jpt.jpa.core.JpaPlatformProvider;
-
-/**
- *  EclipseLink 2.0 platform config
- */
-public class EclipseLink2_0JpaPlatformProvider
-	extends AbstractEclipseLink2_0JpaPlatformProvider
-{
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLink2_0JpaPlatformProvider();
-
-
-	/**
-	 * Return the singleton
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	protected EclipseLink2_0JpaPlatformProvider() {
-		super();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicCollectionMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicCollectionMappingDefinition2_0.java
deleted file mode 100644
index 0e1dbbbd2d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicCollectionMappingDefinition2_0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicCollectionMappingDefinition;
-
-public class EclipseLinkJavaBasicCollectionMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = EclipseLinkJavaBasicCollectionMappingDefinition.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaBasicCollectionMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaBasicCollectionMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
-		Access2_0Annotation.ANNOTATION_NAME,
-	};
-	private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		SUPPORTING_ANNOTATION_NAMES_2_0
-	);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicMapMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicMapMappingDefinition2_0.java
deleted file mode 100644
index c7c692fc8e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicMapMappingDefinition2_0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMapMappingDefinition;
-
-public class EclipseLinkJavaBasicMapMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = EclipseLinkJavaBasicMapMappingDefinition.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaBasicMapMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaBasicMapMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
-		Access2_0Annotation.ANNOTATION_NAME,
-	};
-	private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		SUPPORTING_ANNOTATION_NAMES_2_0
-	);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicMappingDefinition2_0.java
deleted file mode 100644
index 98c83cf5cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaBasicMappingDefinition2_0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaBasicMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMappingDefinition;
-
-public class EclipseLinkJavaBasicMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-	implements DefaultJavaAttributeMappingDefinition
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaBasicMappingDefinition2_0.instance();
-
-	// singleton
-	private static final DefaultJavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaBasicMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaBasicMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaBasicMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-
-	public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
-		return EclipseLinkJavaBasicMappingDefinition.instance().isDefault(persistentAttribute);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaElementCollectionMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaElementCollectionMappingDefinition2_0.java
deleted file mode 100644
index f75cc7591b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaElementCollectionMappingDefinition2_0.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaElementCollectionMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkJoinFetchAnnotation;
-
-public class EclipseLinkJavaElementCollectionMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaElementCollectionMappingDefinition2_0.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaElementCollectionMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaElementCollectionMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	private static final String[] ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkJoinFetchAnnotation.ANNOTATION_NAME
-	};
-	private static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaEmbeddableDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaEmbeddableDefinition2_0.java
deleted file mode 100644
index c80426caf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaEmbeddableDefinition2_0.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaEmbeddableDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEmbeddableDefinition;
-
-public class EclipseLinkJavaEmbeddableDefinition2_0
-	extends JavaTypeMappingDefinitionWrapper
-{
-	private static final JavaTypeMappingDefinition DELEGATE = JavaEmbeddableDefinition2_0.instance();
-
-	// singleton
-	private static final JavaTypeMappingDefinition INSTANCE = new EclipseLinkJavaEmbeddableDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaEmbeddableDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaTypeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaEmbeddableDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaEntityDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaEntityDefinition2_0.java
deleted file mode 100644
index d4ee20fa1b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaEntityDefinition2_0.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaEntityDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEntityDefinition;
-
-public class EclipseLinkJavaEntityDefinition2_0
-	extends JavaTypeMappingDefinitionWrapper
-{
-	private static final JavaTypeMappingDefinition DELEGATE = JavaEntityDefinition2_0.instance();
-
-	// singleton
-	private static final JavaTypeMappingDefinition INSTANCE = new EclipseLinkJavaEntityDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaEntityDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaTypeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaEntityDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaIdMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaIdMappingDefinition2_0.java
deleted file mode 100644
index 6d94e8420d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaIdMappingDefinition2_0.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.Tools;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaIdMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMappingDefinition;
-
-public class EclipseLinkJavaIdMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaIdMappingDefinition2_0.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaIdMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaIdMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	/**
-	 * Check whether the <code>Id</code> mapping is "specified" according to
-	 * the spec then check for EclipseLink default mappings that negate the
-	 * <code>Id</code> mapping.
-	 */
-	@Override
-	public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
-		boolean specSpecified = super.isSpecified(persistentAttribute);
-		return specSpecified && ! this.isDefaultDerivedId(persistentAttribute);
-	}
-
-	/**
-	 * EclipseLink supports default M:1 and 1:1 mappings.
-	 */
-	private boolean isDefaultDerivedId(JavaPersistentAttribute persistentAttribute) {
-		String defaultKey = persistentAttribute.getDefaultMappingKey();
-		return Tools.valuesAreEqual(defaultKey, this.getManyToOneKey()) ||
-				Tools.valuesAreEqual(defaultKey, this.getOneToOneKey());
-	}
-
-	private String getManyToOneKey() {
-		return EclipseLinkJavaOneToOneMappingDefinition2_0.instance().getKey();
-	}
-
-	private String getOneToOneKey() {
-		return EclipseLinkJavaOneToOneMappingDefinition2_0.instance().getKey();
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaBasicMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaManyToManyMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaManyToManyMappingDefinition2_0.java
deleted file mode 100644
index ab750da42f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaManyToManyMappingDefinition2_0.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaManyToManyMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaManyToManyMappingDefinition;
-
-public class EclipseLinkJavaManyToManyMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaManyToManyMappingDefinition2_0.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaManyToManyMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaManyToManyMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaManyToManyMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaManyToOneMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaManyToOneMappingDefinition2_0.java
deleted file mode 100644
index b8976e556b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaManyToOneMappingDefinition2_0.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaManyToOneMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaManyToOneMappingDefinition;
-
-public class EclipseLinkJavaManyToOneMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaManyToOneMappingDefinition2_0.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaManyToOneMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaManyToOneMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaManyToOneMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaMappedSuperclassDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaMappedSuperclassDefinition2_0.java
deleted file mode 100644
index ddff5293e7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaMappedSuperclassDefinition2_0.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaMappedSuperclassDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaEntityDefinition;
-
-public class EclipseLinkJavaMappedSuperclassDefinition2_0
-	extends JavaTypeMappingDefinitionWrapper
-{
-	private static final JavaTypeMappingDefinition DELEGATE = JavaMappedSuperclassDefinition2_0.instance();
-
-	// singleton
-	private static final JavaTypeMappingDefinition INSTANCE = new EclipseLinkJavaMappedSuperclassDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaMappedSuperclassDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaTypeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaEntityDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaOneToManyMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaOneToManyMappingDefinition2_0.java
deleted file mode 100644
index 4b1f4739d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaOneToManyMappingDefinition2_0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToManyMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMappingDefinition;
-
-public class EclipseLinkJavaOneToManyMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-	implements DefaultJavaAttributeMappingDefinition
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaOneToManyMappingDefinition2_0.instance();
-
-	// singleton
-	private static final DefaultJavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaOneToManyMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaOneToManyMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaOneToManyMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-
-	public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
-		return EclipseLinkJavaOneToManyMappingDefinition.instance().isDefault(persistentAttribute);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaOneToOneMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaOneToOneMappingDefinition2_0.java
deleted file mode 100644
index 26859287ae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaOneToOneMappingDefinition2_0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToOneMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToOneMappingDefinition;
-
-public class EclipseLinkJavaOneToOneMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-	implements DefaultJavaAttributeMappingDefinition
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaOneToOneMappingDefinition2_0.instance();
-
-	// singleton
-	private static final DefaultJavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaOneToOneMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaOneToOneMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaOneToOneMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-
-	public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
-		return EclipseLinkJavaOneToOneMappingDefinition.instance().isDefault(persistentAttribute);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaTransformationMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaTransformationMappingDefinition2_0.java
deleted file mode 100644
index af6b6dab54..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaTransformationMappingDefinition2_0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaTransformationMappingDefinition;
-
-public class EclipseLinkJavaTransformationMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = EclipseLinkJavaTransformationMappingDefinition.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaTransformationMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaTransformationMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
-		Access2_0Annotation.ANNOTATION_NAME,
-	};
-	private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		SUPPORTING_ANNOTATION_NAMES_2_0
-	);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition2_0.java
deleted file mode 100644
index fb5dd82c53..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition2_0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.DefaultJavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaVariableOneToOneMappingDefinition;
-
-public class EclipseLinkJavaVariableOneToOneMappingDefinition2_0
-	extends DefaultJavaAttributeMappingDefinitionWrapper
-{
-	private static final DefaultJavaAttributeMappingDefinition DELEGATE = EclipseLinkJavaVariableOneToOneMappingDefinition.instance();
-
-	// singleton
-	private static final DefaultJavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaVariableOneToOneMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static DefaultJavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaVariableOneToOneMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected DefaultJavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
-		Access2_0Annotation.ANNOTATION_NAME,
-	};
-	private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		SUPPORTING_ANNOTATION_NAMES_2_0
-	);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaVersionMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaVersionMappingDefinition2_0.java
deleted file mode 100644
index af86a61316..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/EclipseLinkJavaVersionMappingDefinition2_0.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaVersionMappingDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaBasicMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.EclipseLinkJavaOneToOneMappingDefinition;
-
-public class EclipseLinkJavaVersionMappingDefinition2_0
-	extends JavaAttributeMappingDefinitionWrapper
-{
-	private static final JavaAttributeMappingDefinition DELEGATE = JavaVersionMappingDefinition2_0.instance();
-
-	// singleton
-	private static final JavaAttributeMappingDefinition INSTANCE = new EclipseLinkJavaVersionMappingDefinition2_0();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaAttributeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaVersionMappingDefinition2_0() {
-		super();
-	}
-
-	@Override
-	protected JavaAttributeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaBasicMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES
-	);
-
-	public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
-		return EclipseLinkJavaOneToOneMappingDefinition.instance().isDefault(persistentAttribute);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/JavaEclipseLinkElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/JavaEclipseLinkElementCollectionMapping2_0.java
deleted file mode 100644
index acbca69f97..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/java/JavaEclipseLinkElementCollectionMapping2_0.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java;
-
-import java.util.List;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaConverter;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.AbstractJavaElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.EclipseLinkElementCollectionMapping2_0;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-
-public class JavaEclipseLinkElementCollectionMapping2_0
-	extends AbstractJavaElementCollectionMapping2_0
-	implements EclipseLinkElementCollectionMapping2_0
-{
-	protected final JavaEclipseLinkJoinFetch joinFetch;
-
-
-	public JavaEclipseLinkElementCollectionMapping2_0(JavaPersistentAttribute parent) {
-		super(parent);
-		this.joinFetch = new JavaEclipseLinkJoinFetch(this);
-	}
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		return this.joinFetch;
-	}
-
-
-	// ********** converter adapters **********
-
-	/**
-	 * put the EclipseLink convert adapter first - this is the order EclipseLink searches
-	 */
-	@Override
-	protected Iterable<JavaConverter.Adapter> getConverterAdapters() {
-		return new CompositeIterable<JavaConverter.Adapter>(
-				JavaEclipseLinkConvert.Adapter.instance(),
-				super.getConverterAdapters()
-			);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
-		super.validate(messages, reporter, astRoot);
-		this.joinFetch.validate(messages, reporter, astRoot);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
deleted file mode 100644
index 5ea38dc4ab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmConverter;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.AbstractOrmElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.EclipseLinkElementCollectionMapping2_0;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class EclipseLinkOrmElementCollectionMapping2_0
-	extends AbstractOrmElementCollectionMapping2_0<XmlElementCollection>
-	implements EclipseLinkElementCollectionMapping2_0
-{
-	protected final OrmEclipseLinkJoinFetch joinFetch;
-
-
-	public EclipseLinkOrmElementCollectionMapping2_0(OrmPersistentAttribute parent, XmlElementCollection resourceMapping) {
-		super(parent, resourceMapping);
-		this.joinFetch = new OrmEclipseLinkJoinFetch(this);
-	}
-
-
-	// ********** synchronize/update **********
-
-	@Override
-	public void synchronizeWithResourceModel() {
-		super.synchronizeWithResourceModel();
-		this.joinFetch.synchronizeWithResourceModel();
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.joinFetch.update();
-	}
-
-
-	// ********** join fetch **********
-
-	public EclipseLinkJoinFetch getJoinFetch() {
-		if (getJpaPlatformVersion().getVersion().equals(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_PLATFORM_VERSION_2_0)) {
-			throw new UnsupportedOperationException("join-fetch not supported in EclipseLink 2.0 platform"); //$NON-NLS-1$
-		}
-		return this.joinFetch;
-	}
-
-	// ********** converter adapters **********
-
-	/**
-	 * put the EclipseLink convert adapter first - this is the order EclipseLink searches
-	 */
-	@Override
-	protected Iterable<OrmConverter.Adapter> getConverterAdapters() {
-		return new CompositeIterable<OrmConverter.Adapter>(
-				OrmEclipseLinkConvert.Adapter.instance(),
-				super.getConverterAdapters()
-			);
-	}
-
-
-	// ********** validation **********
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		// TODO join fetch validation
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
deleted file mode 100644
index bef8f8e174..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.Table;
-import org.eclipse.jpt.jpa.core.context.XmlContextNode;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmNamedQuery;
-import org.eclipse.jpt.jpa.core.context.orm.OrmOrderable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmSequenceGenerator;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmAssociationOverrideContainer;
-import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmOrderable;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmCacheable2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmCollectionTable2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmDerivedIdentity2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmNamedQuery2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmOrderColumn2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmOrphanRemoval2_0;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmSequenceGenerator2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverrideContainer2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCollectionTable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmDerivedIdentity2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmEmbeddedMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderColumn2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovable2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmSingleRelationshipMapping2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmXml2_0ContextNodeFactory;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection;
-
-public class EclipseLinkOrmXml2_0ContextNodeFactory
-	extends EclipseLinkOrmXmlContextNodeFactory
-	implements OrmXml2_0ContextNodeFactory
-{	
-
-	public OrmAssociationOverrideContainer buildOrmAssociationOverrideContainer(OrmEmbeddedMapping2_0 parent, OrmAssociationOverrideContainer2_0.Owner owner) {
-		return new GenericOrmAssociationOverrideContainer(parent, owner);
-	}
-	
-	@Override
-	public OrmSequenceGenerator buildOrmSequenceGenerator(XmlContextNode parent, org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator resourceSequenceGenerator) {
-		return new GenericOrmSequenceGenerator2_0(parent, resourceSequenceGenerator);
-	}
-	
-	public OrmDerivedIdentity2_0 buildOrmDerivedIdentity(OrmSingleRelationshipMapping2_0 parent) {
-		return new GenericOrmDerivedIdentity2_0(parent);
-	}
-	
-	public OrmElementCollectionMapping2_0 buildOrmElementCollectionMapping2_0(OrmPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection resourceMapping) {
-		return new EclipseLinkOrmElementCollectionMapping2_0(parent, (XmlElementCollection) resourceMapping);
-	}
-	
-	public OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent) {
-		return new GenericOrmCacheable2_0(parent);
-	}
-	
-	public OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent) {
-		return new GenericOrmOrphanRemoval2_0(parent);
-	}
-
-	@Override
-	public OrmNamedQuery buildOrmNamedQuery(XmlContextNode parent, XmlNamedQuery resourceNamedQuery) {
-		return new GenericOrmNamedQuery2_0(parent, resourceNamedQuery);
-	}
-
-	public OrmCollectionTable2_0 buildOrmCollectionTable(OrmElementCollectionMapping2_0 parent, Table.Owner owner) {
-		return new GenericOrmCollectionTable2_0(parent, owner);
-	}
-
-	@Override
-	public OrmOrderable buildOrmOrderable(OrmAttributeMapping parent) {
-		throw new UnsupportedOperationException("use #buildOrmOrderable(OrmAttributeMapping parent, Orderable2_0.Owner owner)"); //$NON-NLS-1$
-	}
-
-	public OrmOrderable2_0 buildOrmOrderable(OrmAttributeMapping parent, Orderable2_0.Owner owner) {
-		return new GenericOrmOrderable(parent, owner);
-	}
-	
-	public OrmOrderColumn2_0 buildOrmOrderColumn(OrmOrderable2_0 parent, OrmOrderColumn2_0.Owner owner) {
-		return new GenericOrmOrderColumn2_0(parent, owner);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0Definition.java
deleted file mode 100644
index dd0488b986..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0Definition.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.orm;
-
-import java.util.ArrayList;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.context.orm.NullOrmAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmBasicMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddableDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddedIdMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddedMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEntityDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmIdMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmManyToManyMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmManyToOneMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmMappedSuperclassDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOneToManyMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmTransientMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.orm.OrmVersionMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmElementCollectionMapping2_0Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkBasicCollectionMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkBasicMapMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkTransformationMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkVariableOneToOneMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.EclipseLink2_0JpaPlatformProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-
-public class EclipseLinkOrmXml2_0Definition
-	extends AbstractOrmXmlDefinition
-{
-	// singleton
-	private static final OrmXmlDefinition INSTANCE = new EclipseLinkOrmXml2_0Definition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmXmlDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	protected EclipseLinkOrmXml2_0Definition() {
-		super();
-	}
-
-	public JptResourceType getResourceType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_0_RESOURCE_TYPE;
-	}
-
-	public EFactory getResourceNodeFactory() {
-		return EclipseLinkOrmFactory.eINSTANCE;
-	}
-
-	@Override
-	protected OrmXmlContextNodeFactory buildContextNodeFactory() {
-		return new EclipseLinkOrmXml2_0ContextNodeFactory();
-	}
-
-	@Override
-	protected void addTypeMappingDefinitionsTo(ArrayList<OrmTypeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, TYPE_MAPPING_DEFINITIONS);
-	}
-
-	/**
-	 * Order should not matter here; but we'll use the same order as for Java.
-	 * @see EclipseLink2_0JpaPlatformProvider
-	 */
-	protected static final OrmTypeMappingDefinition[] TYPE_MAPPING_DEFINITIONS = new OrmTypeMappingDefinition[] {
-		OrmEntityDefinition.instance(),
-		OrmEmbeddableDefinition.instance(),
-		OrmMappedSuperclassDefinition.instance()
-	};
-
-	@Override
-	protected void addAttributeMappingDefinitionsTo(ArrayList<OrmAttributeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, ATTRIBUTE_MAPPING_DEFINITIONS);
-	}
-
-	/**
-	 * Order should not matter here; but we'll use the same order as for Java.
-	 * @see EclipseLink2_0JpaPlatformProvider
-	 */
-	protected static final OrmAttributeMappingDefinition[] ATTRIBUTE_MAPPING_DEFINITIONS = new OrmAttributeMappingDefinition[] {
-		OrmTransientMappingDefinition.instance(),
-		OrmEclipseLinkBasicCollectionMappingDefinition.instance(),
-		OrmEclipseLinkBasicMapMappingDefinition.instance(),
-		OrmElementCollectionMapping2_0Definition.instance(),
-		OrmIdMappingDefinition.instance(),
-		OrmVersionMappingDefinition.instance(),
-		OrmBasicMappingDefinition.instance(),
-		OrmEmbeddedMappingDefinition.instance(),
-		OrmEmbeddedIdMappingDefinition.instance(),
-		OrmEclipseLinkTransformationMappingDefinition.instance(),
-		OrmManyToManyMappingDefinition.instance(),
-		OrmManyToOneMappingDefinition.instance(),
-		OrmOneToManyMappingDefinition.instance(),
-		OrmOneToOneMappingDefinition.instance(),
-		OrmEclipseLinkVariableOneToOneMappingDefinition.instance(),
-		NullOrmAttributeMappingDefinition.instance()
-	};
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java
deleted file mode 100644
index b4eadd2e74..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlContextNodeFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence;
-
-import org.eclipse.jpt.jpa.core.context.persistence.JarFileRef;
-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.PersistenceUnitProperties;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.connection.JpaConnection2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.JpaOptions2_0;
-import org.eclipse.jpt.jpa.core.resource.persistence.XmlJarFileRef;
-import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.EclipseLinkJarFileRef;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence.connection.EclipseLinkConnection2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence.logging.EclipseLinkLogging2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence.options.EclipseLinkOptions2_0;
-
-
-public class EclipseLink2_0PersistenceXmlContextNodeFactory 
-	extends AbstractPersistenceXmlContextNodeFactory
-	implements EclipseLinkPersistenceXmlContextNodeFactory
-{
-	
-	@Override
-	public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) {
-		return new EclipseLinkPersistenceUnit(parent, xmlPersistenceUnit);
-	}
-	
-	@Override
-	public JarFileRef buildJarFileRef(PersistenceUnit parent, XmlJarFileRef xmlJarFileRef) {
-		return new EclipseLinkJarFileRef(parent, xmlJarFileRef);
-	}
-	
-	public JpaConnection2_0 buildConnection(PersistenceUnit parent) {
-		return new EclipseLinkConnection2_0((PersistenceUnit2_0) parent);
-	}
-	
-	public JpaOptions2_0 buildOptions(PersistenceUnit parent) {
-		return new EclipseLinkOptions2_0((PersistenceUnit2_0) parent);
-	}
-
-	public PersistenceUnitProperties buildLogging(PersistenceUnit parent) {
-		return new EclipseLinkLogging2_0((PersistenceUnit2_0) parent);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlDefinition.java
deleted file mode 100644
index 1ecb71ad1f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/EclipseLink2_0PersistenceXmlDefinition.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceXmlDefinition;
-import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Factory;
-
-public class EclipseLink2_0PersistenceXmlDefinition
-	extends AbstractPersistenceXmlDefinition
-{
-	// singleton
-	private static final PersistenceXmlDefinition INSTANCE = new EclipseLink2_0PersistenceXmlDefinition();
-
-	/**
-	 * Return the singleton
-	 */
-	public static PersistenceXmlDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink2_0PersistenceXmlDefinition() {
-		super();
-	}
-
-	public JptResourceType getResourceType() {
-		return JptJpaCorePlugin.PERSISTENCE_XML_2_0_RESOURCE_TYPE;
-	}
-
-	public EFactory getResourceNodeFactory() {
-		return PersistenceV2_0Factory.eINSTANCE;
-	}
-
-	@Override
-	protected PersistenceXmlContextNodeFactory buildContextNodeFactory() {
-		return new EclipseLink2_0PersistenceXmlContextNodeFactory();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java
deleted file mode 100644
index 73c94659ed..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/connection/EclipseLinkConnection2_0.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009, 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence.connection;
-
-import java.util.Map;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.connection.JpaConnection2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection.Connection;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.connection.EclipseLinkConnection;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.persistence.connection.Connection2_0;
-
-
-/**
- *  EclipseLinkConnection2_0
- */
-public class EclipseLinkConnection2_0 extends EclipseLinkConnection
-	implements Connection2_0
-{
-
-	// ********** constructors **********
-	public EclipseLinkConnection2_0(PersistenceUnit2_0 parent) {
-		super(parent);
-	}
-	
-	// ********** initialization **********
-	@Override
-	protected void initializeDatabaseConnectionProperties() {
-		this.driver = 
-			this.getStringValue(JpaConnection2_0.PERSISTENCE_JDBC_DRIVER);
-		this.url = 
-			this.getStringValue(JpaConnection2_0.PERSISTENCE_JDBC_URL);
-		this.user = 
-			this.getStringValue(JpaConnection2_0.PERSISTENCE_JDBC_USER);
-		this.password = 
-			this.getStringValue(JpaConnection2_0.PERSISTENCE_JDBC_PASSWORD);
-	}
-	
-	@Override
-	protected void postInitialize() {
-		super.postInitialize();
-
-		// Initialize Properties from legacy properties names if not initialized.
-		if(this.persistenceUnitKeyExists(ECLIPSELINK_DRIVER)) {
-			if(this.driver == null) {
-				this.driver = this.getStringValue(ECLIPSELINK_DRIVER);
-			}
-		}
-		if(this.persistenceUnitKeyExists(ECLIPSELINK_URL)) {
-			if(this.url == null) {
-				this.url = this.getStringValue(ECLIPSELINK_URL);
-			}
-		}
-		if(this.persistenceUnitKeyExists(ECLIPSELINK_USER)) {
-			if(this.user == null) {
-				this.user = this.getStringValue(ECLIPSELINK_USER);
-			}
-		}
-		if(this.persistenceUnitKeyExists(ECLIPSELINK_PASSWORD)) {
-			if(this.password == null) {
-				this.password = this.getStringValue(ECLIPSELINK_PASSWORD);
-			}
-		}
-	}
-
-	// ********** behavior **********
-
-	@Override
-	public void propertyValueChanged(String propertyName, String newValue) {
-		super.propertyValueChanged(propertyName, newValue);
-
-		if (propertyName.equals(JpaConnection2_0.PERSISTENCE_JDBC_DRIVER)) {
-			this.driverChanged(newValue);
-		}
-		else if (propertyName.equals(JpaConnection2_0.PERSISTENCE_JDBC_URL)) {
-			this.urlChanged(newValue);
-		}
-		else if (propertyName.equals(JpaConnection2_0.PERSISTENCE_JDBC_USER)) {
-			this.userChanged(newValue);
-		}
-		else if (propertyName.equals(JpaConnection2_0.PERSISTENCE_JDBC_PASSWORD)) {
-			this.passwordChanged(newValue);
-		}
-	}
-	
-	@Override
-	public void propertyRemoved(String propertyName) {
-		super.propertyRemoved(propertyName);
-		
-		if (propertyName.equals(JpaConnection2_0.PERSISTENCE_JDBC_DRIVER)) {
-			this.driverChanged(null);
-		}
-		else if (propertyName.equals(JpaConnection2_0.PERSISTENCE_JDBC_URL)) {
-			this.urlChanged(null);
-		}
-		else if (propertyName.equals(JpaConnection2_0.PERSISTENCE_JDBC_USER)) {
-			this.userChanged(null);
-		}
-		else if (propertyName.equals(JpaConnection2_0.PERSISTENCE_JDBC_PASSWORD)) {
-			this.passwordChanged(null);
-		}
-	}
-
-	@Override
-	protected void addDatabaseConnectionPropertyNames(Map<String, String> propertyNames) {
-		propertyNames.put(
-			JpaConnection2_0.PERSISTENCE_JDBC_DRIVER,
-			Connection.DRIVER_PROPERTY);
-		propertyNames.put(
-			JpaConnection2_0.PERSISTENCE_JDBC_URL,
-			Connection.URL_PROPERTY);
-		propertyNames.put(
-			JpaConnection2_0.PERSISTENCE_JDBC_USER,
-			Connection.USER_PROPERTY);
-		propertyNames.put(
-			JpaConnection2_0.PERSISTENCE_JDBC_PASSWORD,
-			Connection.PASSWORD_PROPERTY);
-	}
-	
-	/**
-	 * Migrate properties names to EclipseLink 2.0 names.
-	 */
-	private void migrateProperties() {
-		this.migrateStringProperty(ECLIPSELINK_DRIVER, JpaConnection2_0.PERSISTENCE_JDBC_DRIVER, this.driver);
-		this.migrateStringProperty(ECLIPSELINK_URL, JpaConnection2_0.PERSISTENCE_JDBC_URL, this.url);
-		this.migrateStringProperty(ECLIPSELINK_USER, JpaConnection2_0.PERSISTENCE_JDBC_USER, this.user);
-		this.migrateStringProperty(ECLIPSELINK_PASSWORD, JpaConnection2_0.PERSISTENCE_JDBC_PASSWORD, this.password);
-	}
-	
-	private void migrateStringProperty(String oldKey, String newKey, String value) {
-		if(this.persistenceUnitKeyExists(oldKey)) {
-			this.getPersistenceUnit().removeProperty(oldKey);
-			this.getPersistenceUnit().setProperty(newKey, value);
-		}
-	}
-
-	/**
-     * Migrate all properties names before the property is set
-	 */
-	@Override
-	protected void preSetProperty() {
-		
-		this.migrateProperties();
-	}
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/logging/EclipseLinkLogging2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/logging/EclipseLinkLogging2_0.java
deleted file mode 100644
index 58ac0a7bf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/logging/EclipseLinkLogging2_0.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009, 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence.logging;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.LoggingLevel;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.logging.EclipseLinkLogging;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.persistence.logging.Logging2_0;
-
-/**
- *  EclipseLinkLogging2_0
- */
-public class EclipseLinkLogging2_0 extends EclipseLinkLogging
-	implements Logging2_0
-{
-	// ********** EclipseLink properties **********
-
-	/** 
-	 * Store Category levels in a map
-	 * key/value pairs, where: 
-	 * 		key = Category property id
-	 * 		value = value
-	 */
-	private Map<String, LoggingLevel> categoryValues;
-
-	private Boolean connection;
-	
-	private LoggingLevel categoriesDefaultValue;
-	
-	// ********** constructors **********
-	public EclipseLinkLogging2_0(PersistenceUnit2_0 parent) {
-		super(parent);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		super.initializeProperties();
-
-		this.connection = 
-			this.getBooleanValue(ECLIPSELINK_CONNECTION);
-		
-		this.categoriesDefaultValue = 
-			this.getEnumValue(ECLIPSELINK_LEVEL, LoggingLevel.values());
-		this.initializeCategory(SQL_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(TRANSACTION_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(EVENT_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(CONNECTION_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(QUERY_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(CACHE_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(PROPAGATION_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(SEQUENCING_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(EJB_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(DMS_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(EJB_OR_METADATA_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(METAMODEL_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(WEAVER_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(PROPERTIES_CATEGORY_LOGGING_PROPERTY);
-		this.initializeCategory(SERVER_CATEGORY_LOGGING_PROPERTY);
-	}
-	
-	@Override
-	protected void initialize() {
-		super.initialize();
-
-		this.categoryValues = new HashMap<String, LoggingLevel>();
-	}
-
-	/**
-	 * Convenience method to set a logging level category value from the value in the persistence unit.
-	 * 
-	 * key = Category property id; value = value (LoggingLevel)
-	 * @param categoryId - Category property id
-	 */
-	private void initializeCategory(String categoryId) {
-		String puKey = this.persistenceUnitKeyOf(categoryId);
-		LoggingLevel puValue = this.getEnumValue(puKey, LoggingLevel.values());
-
-		this.categoryValues.put(categoryId, puValue);
-	}
-
-	// ********** behavior **********
-	
-	@Override
-	public void propertyValueChanged(String propertyName, String newValue) {
-		super.propertyValueChanged(propertyName, newValue);
-
-		if (propertyName.equals(ECLIPSELINK_CONNECTION)) {
-			this.connectionChanged(newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SQL_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_SQL_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TRANSACTION_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_TRANSACTION_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EVENT_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_EVENT_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CONNECTION_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_CONNECTION_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_QUERY_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_QUERY_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_CACHE_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_PROPAGATION_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_PROPAGATION_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SEQUENCING_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_SEQUENCING_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EJB_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_EJB_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_DMS_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_DMS_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EJB_OR_METADATA_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_EJB_OR_METADATA_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_METAMODEL_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_METAMODEL_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVER_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_WEAVER_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_PROPERTIES_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_PROPERTIES_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SERVER_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_SERVER_CATEGORY_LOGGING_LEVEL, newValue);
-		}
-	}
-	
-	@Override
-	public void propertyRemoved(String propertyName) {
-		super.propertyRemoved(propertyName);
-
-		if (propertyName.equals(ECLIPSELINK_CONNECTION)) {
-			this.connectionChanged(null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SQL_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_SQL_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_TRANSACTION_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_TRANSACTION_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EVENT_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_EVENT_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CONNECTION_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_CONNECTION_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_QUERY_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_QUERY_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_CACHE_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_CACHE_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_PROPAGATION_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_PROPAGATION_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SEQUENCING_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_SEQUENCING_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EJB_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_EJB_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_DMS_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_DMS_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_EJB_OR_METADATA_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_EJB_OR_METADATA_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_METAMODEL_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_METAMODEL_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_WEAVER_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_WEAVER_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_PROPERTIES_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_PROPERTIES_CATEGORY_LOGGING_LEVEL, null);
-		}
-		else if (propertyName.equals(ECLIPSELINK_SERVER_CATEGORY_LOGGING_LEVEL)) {
-			this.categoryLoggingChanged_(ECLIPSELINK_SERVER_CATEGORY_LOGGING_LEVEL, null);
-		}
-	}
-
-	/**
-	 * Adds property names key/value pairs, where: 
-	 * 		key = EclipseLink property key
-	 * 		value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		super.addPropertyNames(propertyNames);
-
-		propertyNames.put(
-			ECLIPSELINK_CONNECTION,
-			CONNECTION_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_SQL_CATEGORY_LOGGING_LEVEL,
-			SQL_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_TRANSACTION_CATEGORY_LOGGING_LEVEL,
-			TRANSACTION_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_EVENT_CATEGORY_LOGGING_LEVEL,
-			EVENT_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_CONNECTION_CATEGORY_LOGGING_LEVEL,
-			CONNECTION_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_QUERY_CATEGORY_LOGGING_LEVEL,
-			QUERY_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_CACHE_CATEGORY_LOGGING_LEVEL,
-			CACHE_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_PROPAGATION_CATEGORY_LOGGING_LEVEL,
-			PROPAGATION_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_SEQUENCING_CATEGORY_LOGGING_LEVEL,
-			SEQUENCING_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_EJB_CATEGORY_LOGGING_LEVEL,
-			EJB_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_DMS_CATEGORY_LOGGING_LEVEL,
-			DMS_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_EJB_OR_METADATA_CATEGORY_LOGGING_LEVEL,
-			EJB_OR_METADATA_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_METAMODEL_CATEGORY_LOGGING_LEVEL,
-			METAMODEL_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_WEAVER_CATEGORY_LOGGING_LEVEL,
-			WEAVER_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_PROPERTIES_CATEGORY_LOGGING_LEVEL,
-			PROPERTIES_CATEGORY_LOGGING_PROPERTY);
-		propertyNames.put(
-			ECLIPSELINK_SERVER_CATEGORY_LOGGING_LEVEL,
-			SERVER_CATEGORY_LOGGING_PROPERTY);
-	}
-
-	// ********** Connection **********
-	public Boolean getConnection() {
-		return this.connection;
-	}
-
-	public void setConnection(Boolean newConnection) {
-		Boolean old = this.connection;
-		this.connection = newConnection;
-		this.putProperty(CONNECTION_PROPERTY, newConnection);
-		this.firePropertyChanged(CONNECTION_PROPERTY, old, newConnection);
-	}
-
-	private void connectionChanged(String stringValue) {
-		Boolean newValue = getBooleanValueOf(stringValue);
-		
-		Boolean old = this.connection;
-		this.connection = newValue;
-		this.firePropertyChanged(CONNECTION_PROPERTY, old, newValue);
-	}
-
-	public Boolean getDefaultConnection() {
-		return DEFAULT_CONNECTION;
-	}
-	
-	// ********** Category Levels **********
-	
-	public LoggingLevel getLevel(String category) {
-
-		return this.categoryValues.get(category);
-	}
-
-	public void setLevel(String category, LoggingLevel newLevel) {
-		LoggingLevel old = this.getLevel(category);
-		this.categoryValues.put(category, newLevel);
-		this.putProperty(category, newLevel);
-		this.firePropertyChanged(category, old, newLevel);
-	}
-
-	private void categoryLoggingChanged_(String eclipselinkKey, String stringValue) {
-		String category = this.propertyIdOf(eclipselinkKey);
-		this.categoryLoggingChanged(category, stringValue);
-	}
-
-	private void categoryLoggingChanged(String category, String stringValue) {
-		LoggingLevel enumValue = getEnumValueOf(stringValue, LoggingLevel.values());
-		LoggingLevel old = this.getLevel(category);
-		this.categoryValues.put(category, enumValue);
-		this.firePropertyChanged(category, old, enumValue);
-	}
-
-	public LoggingLevel getCategoriesDefaultLevel() {
-		return (this.categoriesDefaultValue == null) ? super.getDefaultLevel() : this.categoriesDefaultValue;
-	}
-
-	@Override
-	public void setLevel(LoggingLevel level) {
-		super.setLevel(level);
-		this.setDefaultLevel(level);
-	}
-
-	public void setDefaultLevel(LoggingLevel level) {
-		LoggingLevel old = this.categoriesDefaultValue;
-		this.categoriesDefaultValue = level;
-		this.firePropertyChanged(CATEGORIES_DEFAULT_LOGGING_PROPERTY, old, level);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java
deleted file mode 100644
index 0eb6bdcb6a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/context/persistence/options/EclipseLinkOptions2_0.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.persistence.options;
-
-import java.util.List;
-import java.util.Map;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.persistence.options.EclipseLinkOptions;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.persistence.options.Options2_0;
-
-/**
- *  EclipseLinkOptions2_0
- */
-public class EclipseLinkOptions2_0 extends EclipseLinkOptions
-	implements Options2_0
-{
-	// ********** GenericConnection properties **********
-	private Integer lockTimeout;
-	private Integer queryTimeout;
-	private List<String> validationGroupPrePersists;
-	private List<String> validationGroupPreUpdates;
-	private List<String> validationGroupPreRemoves;
-
-	// ********** constructors **********
-	public EclipseLinkOptions2_0(PersistenceUnit2_0 parent) {
-		super(parent);
-	}
-
-	// ********** initialization **********
-	/**
-	 * Initializes properties with values from the persistence unit.
-	 */
-	@Override
-	protected void initializeProperties() {
-		super.initializeProperties();
-		
-		this.lockTimeout = 
-			this.getIntegerValue(PERSISTENCE_LOCK_TIMEOUT);
-		this.queryTimeout = 
-			this.getIntegerValue(PERSISTENCE_QUERY_TIMEOUT);
-
-		// ValidationMode is initialized with the persistence unit element
-		this.validationGroupPrePersists = this.getCompositeValue(PERSISTENCE_VALIDATION_GROUP_PRE_PERSIST);
-		this.validationGroupPreUpdates = this.getCompositeValue(PERSISTENCE_VALIDATION_GROUP_PRE_UPDATE);
-		this.validationGroupPreRemoves = this.getCompositeValue(PERSISTENCE_VALIDATION_GROUP_PRE_REMOVE);
-	}
-
-	// ********** behavior **********
-
-	@Override
-	public void propertyValueChanged(String propertyName, String newValue) {
-		super.propertyValueChanged(propertyName, newValue);
-		
-		if (propertyName.equals(PERSISTENCE_LOCK_TIMEOUT)) {
-			this.lockTimeoutChanged(newValue);
-		}
-		else if (propertyName.equals(PERSISTENCE_QUERY_TIMEOUT)) {
-			this.queryTimeoutChanged(newValue);
-		}
-		else if (propertyName.equals(PERSISTENCE_VALIDATION_GROUP_PRE_PERSIST)) {
-			this.validationGroupPrePersistsChanged();
-		}
-		else if (propertyName.equals(PERSISTENCE_VALIDATION_GROUP_PRE_UPDATE)) {
-			this.validationGroupPreUpdatesChanged();
-		}
-		else if (propertyName.equals(PERSISTENCE_VALIDATION_GROUP_PRE_REMOVE)) {
-			this.validationGroupPreRemovesChanged();
-		}
-	}
-
-	@Override
-	public void propertyRemoved(String propertyName) {
-		super.propertyRemoved(propertyName);
-		
-		if (propertyName.equals(PERSISTENCE_LOCK_TIMEOUT)) {
-			this.lockTimeoutChanged(null);
-		}
-		else if (propertyName.equals(PERSISTENCE_QUERY_TIMEOUT)) {
-			this.queryTimeoutChanged(null);
-		}
-		else if (propertyName.equals(PERSISTENCE_VALIDATION_GROUP_PRE_PERSIST)) {
-			this.validationGroupPrePersistsChanged();
-		}
-		else if (propertyName.equals(PERSISTENCE_VALIDATION_GROUP_PRE_UPDATE)) {
-			this.validationGroupPreUpdatesChanged();
-		}
-		else if (propertyName.equals(PERSISTENCE_VALIDATION_GROUP_PRE_REMOVE)) {
-			this.validationGroupPreRemovesChanged();
-		}
-	}
-
-	/**
-	 * Adds property names key/value pairs, where: 
-	 * 		key = PU property key
-	 * 		value = property id
-	 */
-	@Override
-	protected void addPropertyNames(Map<String, String> propertyNames) {
-		super.addPropertyNames(propertyNames);
-		
-		propertyNames.put(
-			PERSISTENCE_LOCK_TIMEOUT,
-			LOCK_TIMEOUT_PROPERTY);
-		propertyNames.put(
-			PERSISTENCE_QUERY_TIMEOUT,
-			QUERY_TIMEOUT_PROPERTY);
-		propertyNames.put(
-			PERSISTENCE_VALIDATION_GROUP_PRE_PERSIST,
-			VALIDATION_GROUP_PRE_PERSIST_PROPERTY);
-		propertyNames.put(
-			PERSISTENCE_VALIDATION_GROUP_PRE_UPDATE,
-			VALIDATION_GROUP_PRE_UPDATE_PROPERTY);
-		propertyNames.put(
-			PERSISTENCE_VALIDATION_GROUP_PRE_REMOVE,
-			VALIDATION_GROUP_PRE_REMOVE_PROPERTY);
-	}
-
-	@Override
-	public PersistenceUnit2_0 getPersistenceUnit() {
-		return (PersistenceUnit2_0) super.getPersistenceUnit();
-	}
-
-	// ********** LockTimeout **********
-	public Integer getLockTimeout() {
-		return this.lockTimeout;
-	}
-
-	public void setLockTimeout(Integer newLockTimeout) {
-		Integer old = this.lockTimeout;
-		this.lockTimeout = newLockTimeout;
-		this.putProperty(LOCK_TIMEOUT_PROPERTY, newLockTimeout);
-		this.firePropertyChanged(LOCK_TIMEOUT_PROPERTY, old, newLockTimeout);
-	}
-
-	private void lockTimeoutChanged(String stringValue) {
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.lockTimeout;
-		this.lockTimeout = newValue;
-		this.firePropertyChanged(LOCK_TIMEOUT_PROPERTY, old, newValue);
-	}
-
-	public Integer getDefaultLockTimeout() {
-		return DEFAULT_LOCK_TIMEOUT;
-	}
-
-	// ********** QueryTimeout **********
-	public Integer getQueryTimeout() {
-		return this.queryTimeout;
-	}
-
-	public void setQueryTimeout(Integer newQueryTimeout) {
-		Integer old = this.queryTimeout;
-		this.queryTimeout = newQueryTimeout;
-		this.putProperty(QUERY_TIMEOUT_PROPERTY, newQueryTimeout);
-		this.firePropertyChanged(QUERY_TIMEOUT_PROPERTY, old, newQueryTimeout);
-	}
-
-	private void queryTimeoutChanged(String stringValue) {
-		Integer newValue = getIntegerValueOf(stringValue);
-		
-		Integer old = this.queryTimeout;
-		this.queryTimeout = newValue;
-		this.firePropertyChanged(QUERY_TIMEOUT_PROPERTY, old, newValue);
-	}
-
-	public Integer getDefaultQueryTimeout() {
-		return DEFAULT_QUERY_TIMEOUT;
-	}
-
-	
-	// ********** ValidationGroupPrePersists **********
-
-	public ListIterable<String> getValidationGroupPrePersists(){
-		return new LiveCloneListIterable<String>(this.validationGroupPrePersists);
-	}
-	
-	public int getValidationGroupPrePersistsSize(){
-		return this.validationGroupPrePersists.size();
-	}
-
-	public boolean validationGroupPrePersistExists(String validationGroupPrePersistClassName) {
-
-		for (String validationGroupPrePersist : this.validationGroupPrePersists) {
-			if(validationGroupPrePersist.equals(validationGroupPrePersistClassName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String addValidationGroupPrePersist(String newPrePersistClassName){
-
-		if( ! this.validationGroupPrePersistExists(newPrePersistClassName)) {
-			this.validationGroupPrePersists.add(newPrePersistClassName);
-			this.putPropertyCompositeValue(VALIDATION_GROUP_PRE_PERSIST_PROPERTY, newPrePersistClassName);
-			this.fireListChanged(VALIDATION_GROUP_PRE_PERSIST_LIST, this.validationGroupPrePersists);
-			return newPrePersistClassName;
-		}
-		return null;
-	}
-	
-	public void removeValidationGroupPrePersist(String className){
-
-		if(this.removeValidationGroupPrePersist_(className) != null) {
-			this.removePropertyCompositeValue(VALIDATION_GROUP_PRE_PERSIST_PROPERTY, className);
-			this.fireListChanged(VALIDATION_GROUP_PRE_PERSIST_LIST, this.validationGroupPrePersists);
-		}
-	}
-	
-	private String removeValidationGroupPrePersist_(String className){
-
-		for (String validationGroupPrePersist : this.getValidationGroupPrePersists()) {
-			if(validationGroupPrePersist.equals(className)) {
-				this.validationGroupPrePersists.remove(validationGroupPrePersist);
-				return validationGroupPrePersist;
-			}
-		}
-		return null;
-	}
-
-	private void validationGroupPrePersistsChanged() {
-		this.validationGroupPrePersists = this.getCompositeValue(PERSISTENCE_VALIDATION_GROUP_PRE_PERSIST);
-		this.fireListChanged(VALIDATION_GROUP_PRE_PERSIST_LIST, this.validationGroupPrePersists);
-	}
-
-	// ********** ValidationGroupPreUpdates **********
-
-	public ListIterable<String> getValidationGroupPreUpdates(){
-		return new LiveCloneListIterable<String>(this.validationGroupPreUpdates);
-	}
-	
-	public int getValidationGroupPreUpdatesSize(){
-		return this.validationGroupPreUpdates.size();
-	}
-
-	public boolean validationGroupPreUpdateExists(String validationGroupPreUpdateClassName) {
-
-		for (String validationGroupPreUpdate : this.validationGroupPreUpdates) {
-			if(validationGroupPreUpdate.equals(validationGroupPreUpdateClassName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String addValidationGroupPreUpdate(String newPreUpdateClassName){
-
-		if( ! this.validationGroupPreUpdateExists(newPreUpdateClassName)) {
-			this.validationGroupPreUpdates.add(newPreUpdateClassName);
-			this.putPropertyCompositeValue(VALIDATION_GROUP_PRE_UPDATE_PROPERTY, newPreUpdateClassName);
-			this.fireListChanged(VALIDATION_GROUP_PRE_UPDATE_LIST, this.validationGroupPreUpdates);
-			return newPreUpdateClassName;
-		}
-		return null;
-	}
-	
-	public void removeValidationGroupPreUpdate(String className){
-
-		if(this.removeValidationGroupPreUpdate_(className) != null) {
-			this.removePropertyCompositeValue(VALIDATION_GROUP_PRE_UPDATE_PROPERTY, className);
-			this.fireListChanged(VALIDATION_GROUP_PRE_UPDATE_LIST, this.validationGroupPreUpdates);
-		}
-	}
-	
-	private String removeValidationGroupPreUpdate_(String className){
-
-		for(String validationGroupPreUpdate : this.getValidationGroupPreUpdates()) {
-			if(validationGroupPreUpdate.equals(className)) {
-				this.validationGroupPreUpdates.remove(validationGroupPreUpdate);
-				return validationGroupPreUpdate;
-			}
-		}
-		return null;
-	}
-
-	private void validationGroupPreUpdatesChanged() {
-		this.validationGroupPreUpdates = this.getCompositeValue(PERSISTENCE_VALIDATION_GROUP_PRE_UPDATE);
-		this.fireListChanged(VALIDATION_GROUP_PRE_UPDATE_LIST, this.validationGroupPreUpdates);
-	}
-
-	// ********** ValidationGroupPreRemoves **********
-
-	public ListIterable<String> getValidationGroupPreRemoves(){
-		return new LiveCloneListIterable<String>(this.validationGroupPreRemoves);
-	}
-	
-	public int getValidationGroupPreRemovesSize(){
-		return this.validationGroupPreRemoves.size();
-	}
-
-	public boolean validationGroupPreRemoveExists(String validationGroupPreRemoveClassName) {
-
-		for (String validationGroupPreRemove : this.validationGroupPreRemoves) {
-			if(validationGroupPreRemove.equals(validationGroupPreRemoveClassName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String addValidationGroupPreRemove(String newPreRemoveClassName){
-
-		if( ! this.validationGroupPreRemoveExists(newPreRemoveClassName)) {
-			this.validationGroupPreRemoves.add(newPreRemoveClassName);
-			this.putPropertyCompositeValue(VALIDATION_GROUP_PRE_REMOVE_PROPERTY, newPreRemoveClassName);
-			this.fireListChanged(VALIDATION_GROUP_PRE_REMOVE_LIST, this.validationGroupPreRemoves);
-			return newPreRemoveClassName;
-		}
-		return null;
-	}
-	
-	public void removeValidationGroupPreRemove(String className){
-
-		if(this.removeValidationGroupPreRemove_(className) != null) {
-			this.removePropertyCompositeValue(VALIDATION_GROUP_PRE_REMOVE_PROPERTY, className);
-			this.fireListChanged(VALIDATION_GROUP_PRE_REMOVE_LIST, this.validationGroupPreRemoves);
-		}
-	}
-	
-	private String removeValidationGroupPreRemove_(String className){
-
-		for(String validationGroupPreRemove : this.getValidationGroupPreRemoves()) {
-			if(validationGroupPreRemove.equals(className)) {
-				this.validationGroupPreRemoves.remove(validationGroupPreRemove);
-				return validationGroupPreRemove;
-			}
-		}
-		return null;
-	}
-
-	private void validationGroupPreRemovesChanged() {
-		this.validationGroupPreRemoves = this.getCompositeValue(PERSISTENCE_VALIDATION_GROUP_PRE_REMOVE);
-		this.fireListChanged(VALIDATION_GROUP_PRE_REMOVE_LIST, this.validationGroupPreRemoves);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/ddlgen/EclipseLink2_0DDLGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/ddlgen/EclipseLink2_0DDLGenerator.java
deleted file mode 100644
index 2c81f1fe47..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/ddlgen/EclipseLink2_0DDLGenerator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.ddlgen;
-
-import java.util.Properties;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.connection.JpaConnection2_0;
-import org.eclipse.jpt.jpa.db.ConnectionProfile;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.customization.Customization;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.schema.generation.OutputMode;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.ddlgen.AbstractEclipseLinkDDLGenerator;
-
-/**
- *  EclipseLink2_0DLLGenerator launches the EclipseLink DDL generator in a separate VM.
- *  For this it will create a Java Configuration named "Dali EclipseLink Table Generation" 
- *  in the target workspace (note: the configuration will be overridden at each run).
- *  It will than launch the configuration created with the login information from 
- *  the current Dali project, and passes it to EclipseLink.
- *  
- *  Pre-req in PDE environment:
- *  	org.eclipse.jpt.jpa.eclipselink.core.ddlgen.jar in ECLIPSE_HOME/plugins
- */
-public class EclipseLink2_0DDLGenerator extends AbstractEclipseLinkDDLGenerator
-{
-	static final String VALIDATION_MODE_PROPERTY = "javax.persistence.validation.mode"; 	  //$NON-NLS-1$
-	
-	// ********** constructors **********
-	
-	public static void generate(String puName, JpaProject project, OutputMode outputMode, IProgressMonitor monitor) {
-		if (puName == null || puName.length() == 0 || project == null) {
-			throw new NullPointerException();
-		}
-		new EclipseLink2_0DDLGenerator(puName, project, outputMode).generate(monitor);
-	}
-
-	private EclipseLink2_0DDLGenerator(String puName, JpaProject jpaProject, OutputMode outputMode) {
-		super(puName, jpaProject, outputMode);
-	}
-
-	// ********** EclipseLink properties **********
-	
-	@Override
-	protected void buildAllProperties(Properties properties) {
-		super.buildAllProperties(properties);
-
-		this.putProperty(properties,
-			VALIDATION_MODE_PROPERTY,
-			NONE);
-	}
-
-	@Override
-	protected void buildCustomizationProperties(Properties properties) {
-		super.buildCustomizationProperties(properties);
-		
-		this.putProperty(properties,
-			Customization.ECLIPSELINK_WEAVING,
-			FALSE);
-	}
-
-	@Override
-	protected void buildConnectionProperties(Properties properties) {
-		super.buildConnectionProperties(properties);
-		ConnectionProfile cp = this.getConnectionProfile();
-
-		this.putProperty(properties, 
-			JpaConnection2_0.PERSISTENCE_JDBC_DRIVER,
-			(cp == null) ? "" : cp.getDriverClassName()); //$NON-NLS-1$
-		this.putProperty(properties,
-			JpaConnection2_0.PERSISTENCE_JDBC_URL,
-			(cp == null) ? "" : cp.getURL()); //$NON-NLS-1$
-		this.putProperty(properties,
-			JpaConnection2_0.PERSISTENCE_JDBC_USER,
-			(cp == null) ? "" : cp.getUserName()); //$NON-NLS-1$
-		this.putProperty(properties,
-			JpaConnection2_0.PERSISTENCE_JDBC_PASSWORD,
-			(cp == null) ? "" : cp.getUserPassword()); //$NON-NLS-1$
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/EclipseLinkMapKeyConvert2_0AnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/EclipseLinkMapKeyConvert2_0AnnotationDefinition.java
deleted file mode 100644
index ac28ef8cc8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/EclipseLinkMapKeyConvert2_0AnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.resource.java.binary.BinaryEclipseLinkMapKeyConvertAnnotation2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.resource.java.source.SourceEclipseLinkMapKeyConvertAnnotation2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.resource.java.EclipseLinkMapKeyConvertAnnotation2_0;
-
-/**
- * org.eclipse.persistence.annotations.MapKeyConvert
- */
-public class EclipseLinkMapKeyConvert2_0AnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkMapKeyConvert2_0AnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkMapKeyConvert2_0AnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkMapKeyConvertAnnotation2_0(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkMapKeyConvertAnnotation2_0(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkMapKeyConvertAnnotation2_0.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/binary/BinaryEclipseLinkMapKeyConvertAnnotation2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/binary/BinaryEclipseLinkMapKeyConvertAnnotation2_0.java
deleted file mode 100644
index 7c4d4d6d65..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/binary/BinaryEclipseLinkMapKeyConvertAnnotation2_0.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.binary.BinaryBaseEclipseLinkConvertAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.resource.java.EclipseLink2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.resource.java.EclipseLinkMapKeyConvertAnnotation2_0;
-
-/**
- * org.eclipse.persistence.annotations.MapKeyConvert
- */
-public final class BinaryEclipseLinkMapKeyConvertAnnotation2_0
-	extends BinaryBaseEclipseLinkConvertAnnotation
-	implements EclipseLinkMapKeyConvertAnnotation2_0
-{
-
-	public BinaryEclipseLinkMapKeyConvertAnnotation2_0(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkMapKeyConvertAnnotation2_0.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected String getValueElementName() {
-		return EclipseLink2_0.MAP_KEY_CONVERT__VALUE;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/source/SourceEclipseLinkMapKeyConvertAnnotation2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/source/SourceEclipseLinkMapKeyConvertAnnotation2_0.java
deleted file mode 100644
index bee7f0b9cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_0/resource/java/source/SourceEclipseLinkMapKeyConvertAnnotation2_0.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.resource.java.source;
-
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.source.SourceBaseEclipseLinkConvertAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.resource.java.EclipseLink2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.resource.java.EclipseLinkMapKeyConvertAnnotation2_0;
-
-/**
- * org.eclipse.persistence.annotations.MapKeyConvert
- */
-public final class SourceEclipseLinkMapKeyConvertAnnotation2_0
-	extends SourceBaseEclipseLinkConvertAnnotation
-	implements EclipseLinkMapKeyConvertAnnotation2_0
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(EclipseLinkMapKeyConvertAnnotation2_0.ANNOTATION_NAME);
-
-
-	public SourceEclipseLinkMapKeyConvertAnnotation2_0(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkMapKeyConvertAnnotation2_0.ANNOTATION_NAME;
-	}
-
-	@Override
-	protected String getValueElementName() {
-		return EclipseLink2_0.MAP_KEY_CONVERT__VALUE;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaAnnotationDefinitionProvider.java
deleted file mode 100644
index 296ef9ba05..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaAnnotationDefinitionProvider.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1;
-
-import java.util.ArrayList;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicCollectionAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicMapAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCacheAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkChangeTrackingAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConvertAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCustomizerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkExistenceCheckingAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkJoinFetchAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMutableAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrimaryKeyAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrivateOwnedAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadOnlyAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadTransformerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTransformationAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkVariableOneToOneAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkWriteTransformerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.resource.java.EclipseLinkClassExtractor2_1AnnotationDefinition;
-
-/**
- * Provides annotations for 2.1 EclipseLink platform
- */
-public class EclipseLink2_1JpaAnnotationDefinitionProvider
-	extends AbstractJpaAnnotationDefinitionProvider
-{
-	// singleton
-	private static final JpaAnnotationDefinitionProvider INSTANCE = new EclipseLink2_1JpaAnnotationDefinitionProvider();
-
-	/**
-	 * Return the singleton
-	 */
-	public static JpaAnnotationDefinitionProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink2_1JpaAnnotationDefinitionProvider() {
-		super();
-	}
-
-	@Override
-	protected void addAnnotationDefinitionsTo(ArrayList<AnnotationDefinition> definitions) {
-		CollectionTools.addAll(definitions, ANNOTATION_DEFINITIONS);
-	}
-
-	protected static final AnnotationDefinition[] ANNOTATION_DEFINITIONS = new AnnotationDefinition[] {
-		EclipseLinkBasicCollectionAnnotationDefinition.instance(),
-		EclipseLinkBasicMapAnnotationDefinition.instance(),
-		EclipseLinkCacheAnnotationDefinition.instance(),
-		EclipseLinkChangeTrackingAnnotationDefinition.instance(),
-		EclipseLinkClassExtractor2_1AnnotationDefinition.instance(),
-		EclipseLinkConvertAnnotationDefinition.instance(),
-		EclipseLinkConverterAnnotationDefinition.instance(),
-		EclipseLinkCustomizerAnnotationDefinition.instance(),
-		EclipseLinkExistenceCheckingAnnotationDefinition.instance(),
-		EclipseLinkJoinFetchAnnotationDefinition.instance(),
-		EclipseLinkMutableAnnotationDefinition.instance(),
-		EclipseLinkObjectTypeConverterAnnotationDefinition.instance(),
-		EclipseLinkPrimaryKeyAnnotationDefinition.instance(),
-		EclipseLinkPrivateOwnedAnnotationDefinition.instance(),
-		EclipseLinkReadOnlyAnnotationDefinition.instance(),
-		EclipseLinkReadTransformerAnnotationDefinition.instance(),
-		EclipseLinkStructConverterAnnotationDefinition.instance(),
-		EclipseLinkTransformationAnnotationDefinition.instance(),
-		EclipseLinkTypeConverterAnnotationDefinition.instance(),
-		EclipseLinkVariableOneToOneAnnotationDefinition.instance(),
-		EclipseLinkWriteTransformerAnnotationDefinition.instance()
-	};
-
-	@Override
-	protected void addNestableAnnotationDefinitionsTo(ArrayList<NestableAnnotationDefinition> definitions) {
-		// nothing new for EclipseLink 2.1
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaPlatformFactory.java
deleted file mode 100644
index d3194ae7a4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaPlatformFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1;
-
-import org.eclipse.jpt.common.core.AnnotationProvider;
-import org.eclipse.jpt.jpa.core.JpaFacet;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
-import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
-import org.eclipse.jpt.jpa.core.internal.jpa2.Generic2_0JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkVersion;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.EclipseLink2_0JpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.EclipseLink2_0JpaPlatformFactory;
-
-public class EclipseLink2_1JpaPlatformFactory
-	extends EclipseLink2_0JpaPlatformFactory
-{
-	/**
-	 * zero-argument constructor
-	 */
-	public EclipseLink2_1JpaPlatformFactory() {
-		super();
-	}
-	
-	
-	@Override
-	public JpaPlatform buildJpaPlatform(String id) {
-		return new GenericJpaPlatform(
-			id,
-			buildJpaVersion(),
-			new EclipseLink2_0JpaFactory(), 
-			this.buildAnnotationProvider(),
-			EclipseLink2_1JpaPlatformProvider.instance(), 
-			this.buildJpaVariation());
-	}
-	
-	@Override
-	protected JpaPlatform.Version buildJpaVersion() {
-		return new EclipseLinkVersion(
-				JptJpaEclipseLinkCorePlugin.ECLIPSELINK_PLATFORM_VERSION_2_1,
-				JpaFacet.VERSION_2_0.getVersionString());
-	}
-	
-	@Override
-	protected AnnotationProvider buildAnnotationProvider() {
-		return new JpaAnnotationProvider(
-			Generic2_0JpaAnnotationDefinitionProvider.instance(),
-			EclipseLink2_1JpaAnnotationDefinitionProvider.instance());
-	}
-	
-//	@Override
-//	protected JpaPlatformVariation buildJpaVariation() {
-//		return new JpaPlatformVariation() {
-//				public Supported getTablePerConcreteClassInheritanceIsSupported() {
-//					return Supported.YES;
-//				}
-//				
-//				public boolean isJoinTableOverridable() {
-//					return true;
-//				}
-//			};
-//	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaPlatformProvider.java
deleted file mode 100644
index 4e242a80ca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/EclipseLink2_1JpaPlatformProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1;
-
-import java.util.ArrayList;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.JpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.ResourceDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.AbstractEclipseLink2_0JpaPlatformProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm.EclipseLinkOrmXml2_1Definition;
-
-/**
- *  EclipseLink 2.1 platform config
- */
-public class EclipseLink2_1JpaPlatformProvider
-	extends AbstractEclipseLink2_0JpaPlatformProvider
-{
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLink2_1JpaPlatformProvider();
-
-
-	/**
-	 * Return the singleton
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink2_1JpaPlatformProvider() {
-		super();
-	}
-
-
-	// ********** resource models **********
-
-	@Override
-	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
-		if (contentType.equals(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_1_RESOURCE_TYPE;
-		}
-		return super.getMostRecentSupportedResourceType(contentType);
-	}
-
-	// ********** resource definitions **********
-
-	@Override
-	protected void addResourceDefinitionsTo(ArrayList<ResourceDefinition> definitions) {
-		super.addResourceDefinitionsTo(definitions);
-		definitions.add(EclipseLinkOrmXml2_1Definition.instance());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/EclipseLinkOrmXml2_1ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/EclipseLinkOrmXml2_1ContextNodeFactory.java
deleted file mode 100644
index a74ca6c0a8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/EclipseLinkOrmXml2_1ContextNodeFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm;
-
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.AbstractOrmEclipseLinkBasicCollectionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.AbstractOrmEclipseLinkBasicMapMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.orm.EclipseLinkOrmXml2_0ContextNodeFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap;
-
-public class EclipseLinkOrmXml2_1ContextNodeFactory
-	extends EclipseLinkOrmXml2_0ContextNodeFactory
-{
-
-	@Override
-	public AbstractOrmEclipseLinkBasicCollectionMapping buildOrmEclipseLinkBasicCollectionMapping(OrmPersistentAttribute parent, XmlBasicCollection resourceMapping) {
-		return new OrmEclipseLinkBasicCollectionMapping2_1(parent, resourceMapping);
-	}
-
-	@Override
-	public AbstractOrmEclipseLinkBasicMapMapping buildOrmEclipseLinkBasicMapMapping(OrmPersistentAttribute parent, XmlBasicMap resourceMapping) {
-		return new OrmEclipseLinkBasicMapMapping2_1(parent, resourceMapping);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/EclipseLinkOrmXml2_1Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/EclipseLinkOrmXml2_1Definition.java
deleted file mode 100644
index d0687ec0a5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/EclipseLinkOrmXml2_1Definition.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm;
-
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.orm.EclipseLinkOrmXml2_0Definition;
-
-public class EclipseLinkOrmXml2_1Definition
-	extends EclipseLinkOrmXml2_0Definition
-{
-	// singleton
-	private static final OrmXmlDefinition INSTANCE = new EclipseLinkOrmXml2_1Definition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmXmlDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	protected EclipseLinkOrmXml2_1Definition() {
-		super();
-	}
-
-	@Override
-	public JptResourceType getResourceType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_1_RESOURCE_TYPE;
-	}
-
-	@Override
-	protected OrmXmlContextNodeFactory buildContextNodeFactory() {
-		return new EclipseLinkOrmXml2_1ContextNodeFactory();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/OrmEclipseLinkBasicCollectionMapping2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/OrmEclipseLinkBasicCollectionMapping2_1.java
deleted file mode 100644
index 28dee2d025..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/OrmEclipseLinkBasicCollectionMapping2_1.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.AbstractOrmEclipseLinkBasicCollectionMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkBasicCollectionMapping2_1
-	extends AbstractOrmEclipseLinkBasicCollectionMapping
-{
-	public OrmEclipseLinkBasicCollectionMapping2_1(OrmPersistentAttribute parent, XmlBasicCollection xmlMapping) {
-		super(parent, xmlMapping);
-	}
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		messages.add(
-			DefaultEclipseLinkJpaValidationMessages.buildMessage(
-				IMessage.NORMAL_SEVERITY,
-				EclipseLinkJpaValidationMessages.BASIC_COLLECTION_MAPPING_DEPRECATED,
-				new String[] {this.getName()},
-				this,
-				this.getValidationTextRange()
-			)
-		);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/OrmEclipseLinkBasicMapMapping2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/OrmEclipseLinkBasicMapMapping2_1.java
deleted file mode 100644
index 9c75a75702..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/context/orm/OrmEclipseLinkBasicMapMapping2_1.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm;
-
-import java.util.List;
-import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.AbstractOrmEclipseLinkBasicMapMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class OrmEclipseLinkBasicMapMapping2_1
-	extends AbstractOrmEclipseLinkBasicMapMapping
-{
-	public OrmEclipseLinkBasicMapMapping2_1(OrmPersistentAttribute parent, XmlBasicMap xmlMapping) {
-		super(parent, xmlMapping);
-	}
-
-	@Override
-	public void validate(List<IMessage> messages, IReporter reporter) {
-		super.validate(messages, reporter);
-		messages.add(
-			DefaultEclipseLinkJpaValidationMessages.buildMessage(
-				IMessage.NORMAL_SEVERITY,
-				EclipseLinkJpaValidationMessages.BASIC_MAP_MAPPING_DEPRECATED,
-				new String[] {this.getName()},
-				this,
-				this.getValidationTextRange()
-			)
-		);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/EclipseLinkClassExtractor2_1AnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/EclipseLinkClassExtractor2_1AnnotationDefinition.java
deleted file mode 100644
index 8dd07162f1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/EclipseLinkClassExtractor2_1AnnotationDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.resource.java.binary.BinaryEclipseLinkClassExtractorAnnotation2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.resource.java.source.SourceEclipseLinkClassExtractorAnnotation2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java.EclipseLinkClassExtractorAnnotation2_1;
-
-/**
- * org.eclipse.persistence.annotations.ClassExtractor
- */
-public class EclipseLinkClassExtractor2_1AnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkClassExtractor2_1AnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkClassExtractor2_1AnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkClassExtractorAnnotation2_1(parent, annotatedElement);
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkClassExtractorAnnotation2_1(parent, jdtAnnotation);
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkClassExtractorAnnotation2_1.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/binary/BinaryEclipseLinkClassExtractorAnnotation2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/binary/BinaryEclipseLinkClassExtractorAnnotation2_1.java
deleted file mode 100644
index f1e8fddabf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/binary/BinaryEclipseLinkClassExtractorAnnotation2_1.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java.EclipseLink2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java.EclipseLinkClassExtractorAnnotation2_1;
-
-/**
- * org.eclipse.persistence.annotations.ClassExtractor
- */
-public final class BinaryEclipseLinkClassExtractorAnnotation2_1
-	extends BinaryAnnotation
-	implements EclipseLinkClassExtractorAnnotation2_1 
-{
-	private String value;
-
-
-	public BinaryEclipseLinkClassExtractorAnnotation2_1(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.value = this.buildValue();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setValue_(this.buildValue());
-	}
-
-
-	// ********** EclipseLinkClassExtractorAnnotation2_1 implementation **********
-
-	// ***** value
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String value) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setValue_(String value) {
-		String old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	private String buildValue() {
-		return (String) this.getJdtMemberValue(EclipseLink2_1.CLASS_EXTRACTOR__VALUE);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** fully-qualified class name
-	/**
-	 * binary is already fully-qualified
-	 */
-	public String getFullyQualifiedClassName() {
-		return this.value;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/source/SourceEclipseLinkClassExtractorAnnotation2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/source/SourceEclipseLinkClassExtractorAnnotation2_1.java
deleted file mode 100644
index 3104f9ddaa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_1/resource/java/source/SourceEclipseLinkClassExtractorAnnotation2_1.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleTypeStringExpressionConverter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java.EclipseLink2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java.EclipseLinkClassExtractorAnnotation2_1;
-
-/**
- * org.eclipse.persistence.annotations.ClassExtractor
- */
-public final class SourceEclipseLinkClassExtractorAnnotation2_1
-	extends SourceAnnotation
-	implements EclipseLinkClassExtractorAnnotation2_1
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	private final AnnotationElementAdapter<String> valueAdapter;
-	private String value;
-
-	/**
-	 * @see org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceIdClassAnnotation#fullyQualifiedClassName
-	 */
-	private String fullyQualifiedClassName;
-	// we need a flag since the f-q name can be null
-	private boolean fqClassNameStale = true;
-
-
-	public SourceEclipseLinkClassExtractorAnnotation2_1(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, VALUE_ADAPTER);
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.buildValue(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncValue(this.buildValue(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.value == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-
-	// ********** EclipseLinkClassExtractorAnnotation2_1 implementation **********
-
-	// ***** value
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String value) {
-		if (this.attributeValueHasChanged(this.value, value)) {
-			this.value = value;
-			this.fqClassNameStale = true;
-			this.valueAdapter.setValue(value);
-		}
-	}
-
-	private void syncValue(String astValue) {
-		if (this.attributeValueHasChanged(this.value, astValue)) {
-			this.syncValue_(astValue);
-		}
-	}
-
-	private void syncValue_(String astValue) {
-		String old = this.value;
-		this.value = astValue;
-		this.fqClassNameStale = true;
-		this.firePropertyChanged(VALUE_PROPERTY, old, astValue);
-	}
-
-	private String buildValue(CompilationUnit astRoot) {
-		return this.valueAdapter.getValue(astRoot);
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-	// ***** fully-qualified class name
-	public String getFullyQualifiedClassName() {
-		if (this.fqClassNameStale) {
-			this.fullyQualifiedClassName = this.buildFullyQualifiedClassName();
-			this.fqClassNameStale = false;
-		}
-		return this.fullyQualifiedClassName;
-	}
-
-	private String buildFullyQualifiedClassName() {
-		return (this.value == null) ? null : this.buildFullyQualifiedClassName_();
-	}
-
-	private String buildFullyQualifiedClassName_() {
-		return ASTTools.resolveFullyQualifiedName(this.valueAdapter.getExpression(this.buildASTRoot()));
-	}
-
-
-	// ********** static methods **********
-
-	protected static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<String>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink2_1.CLASS_EXTRACTOR__VALUE, SimpleTypeStringExpressionConverter.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/EclipseLink2_2JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/EclipseLink2_2JpaPlatformFactory.java
deleted file mode 100644
index beb1e96fd7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/EclipseLink2_2JpaPlatformFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_2;
-
-import org.eclipse.jpt.common.core.AnnotationProvider;
-import org.eclipse.jpt.jpa.core.JpaFacet;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
-import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
-import org.eclipse.jpt.jpa.core.internal.jpa2.Generic2_0JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkVersion;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.EclipseLink2_0JpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.EclipseLink2_0JpaPlatformFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.EclipseLink2_1JpaAnnotationDefinitionProvider;
-
-public class EclipseLink2_2JpaPlatformFactory
-	extends EclipseLink2_0JpaPlatformFactory
-{
-	/**
-	 * zero-argument constructor
-	 */
-	public EclipseLink2_2JpaPlatformFactory() {
-		super();
-	}
-	
-	
-	@Override
-	public JpaPlatform buildJpaPlatform(String id) {
-		return new GenericJpaPlatform(
-			id,
-			buildJpaVersion(),
-			new EclipseLink2_0JpaFactory(), 
-			this.buildAnnotationProvider(),
-			EclipseLink2_2JpaPlatformProvider.instance(), 
-			this.buildJpaVariation());
-	}
-	
-	@Override
-	protected JpaPlatform.Version buildJpaVersion() {
-		return new EclipseLinkVersion(
-				JptJpaEclipseLinkCorePlugin.ECLIPSELINK_PLATFORM_VERSION_2_2,
-				JpaFacet.VERSION_2_0.getVersionString());
-	}
-	
-	@Override
-	protected AnnotationProvider buildAnnotationProvider() {
-		return new JpaAnnotationProvider(
-			Generic2_0JpaAnnotationDefinitionProvider.instance(),
-			EclipseLink2_1JpaAnnotationDefinitionProvider.instance());
-	}
-	
-//	@Override
-//	protected JpaPlatformVariation buildJpaVariation() {
-//		return new JpaPlatformVariation() {
-//				public Supported getTablePerConcreteClassInheritanceIsSupported() {
-//					return Supported.YES;
-//				}
-//				
-//				public boolean isJoinTableOverridable() {
-//					return true;
-//				}
-//			};
-//	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/EclipseLink2_2JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/EclipseLink2_2JpaPlatformProvider.java
deleted file mode 100644
index 73c3df5398..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/EclipseLink2_2JpaPlatformProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2010, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-*
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_2;
-
-import java.util.ArrayList;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.ResourceDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.AbstractEclipseLink2_0JpaPlatformProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm.EclipseLinkOrmXml2_1Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_2.context.orm.EclipseLinkOrmXml2_2Definition;
-
-public class EclipseLink2_2JpaPlatformProvider
-	extends AbstractEclipseLink2_0JpaPlatformProvider
-{
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLink2_2JpaPlatformProvider();
-	
-	
-	/**
-	 * Return the singleton
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink2_2JpaPlatformProvider() {
-		super();
-	}
-	
-	
-	// ********** resource models **********
-	
-	@Override
-	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
-		if (contentType.equals(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_2_RESOURCE_TYPE;
-		}
-		return super.getMostRecentSupportedResourceType(contentType);
-	}
-	
-	
-	// ********** resource definitions **********
-
-	@Override
-	protected void addResourceDefinitionsTo(ArrayList<ResourceDefinition> definitions) {
-		super.addResourceDefinitionsTo(definitions);
-		CollectionTools.addAll(definitions, RESOURCE_DEFINITIONS);
-	}
-
-	protected static final ResourceDefinition[] RESOURCE_DEFINITIONS = new ResourceDefinition[] {
-		EclipseLinkOrmXml2_1Definition.instance(),
-		EclipseLinkOrmXml2_2Definition.instance(),
-	};
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/context/orm/EclipseLinkOrmXml2_2Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/context/orm/EclipseLinkOrmXml2_2Definition.java
deleted file mode 100644
index 3f4e0c3f79..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_2/context/orm/EclipseLinkOrmXml2_2Definition.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_2.context.orm;
-
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm.EclipseLinkOrmXml2_1ContextNodeFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm.EclipseLinkOrmXml2_1Definition;
-
-public class EclipseLinkOrmXml2_2Definition
-	extends EclipseLinkOrmXml2_1Definition
-{
-	// singleton
-	private static final OrmXmlDefinition INSTANCE = 
-			new EclipseLinkOrmXml2_2Definition();
-	
-	
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmXmlDefinition instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	protected EclipseLinkOrmXml2_2Definition() {
-		super();
-	}
-	
-	
-//	@Override
-//	public EFactory getResourceNodeFactory() {
-//		return EclipseLinkOrmFactory.eINSTANCE;
-//	}
-	
-	@Override
-	protected OrmXmlContextNodeFactory buildContextNodeFactory() {
-		return new EclipseLinkOrmXml2_1ContextNodeFactory();
-	}
-	
-	@Override
-	public JptResourceType getResourceType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_2_RESOURCE_TYPE;
-	}
-	
-	
-	// ********* ORM type mappings *********
-	
-//	@Override
-//	protected OrmTypeMappingDefinition[] buildOrmTypeMappingDefinitions() {
-//		// order should not matter here, but we'll use the same order as for java
-//		// @see {@link EclipseLink1_1JpaPlatformProvider}
-//		// NOTE: no new type mapping providers from eclipselink 1.0 to 1.1
-//		return new OrmTypeMappingDefinition[] {
-//			OrmEntityDefinition.instance(),
-//			OrmEmbeddableDefinition.instance(),
-//			OrmMappedSuperclassDefinition.instance()};
-//	}
-	
-	
-	// ********** ORM attribute mappings **********
-	
-//	@Override
-//	protected OrmAttributeMappingDefinition[] buildOrmAttributeMappingDefinitions() {
-//		// order should not matter here, but we'll use the same order as for java
-//		// @see {@link EclipseLink1_1JpaPlatformProvider}
-//		return new OrmAttributeMappingDefinition[] {
-//			OrmTransientMappingDefinition.instance(),
-//			OrmEclipseLinkBasicCollectionMappingDefinition.instance(),
-//			OrmEclipseLinkBasicMapMappingDefinition.instance(),
-//			OrmElementCollectionMapping2_0Definition.instance(),
-//			OrmIdMappingDefinition.instance(),
-//			OrmVersionMappingDefinition.instance(),
-//			OrmBasicMappingDefinition.instance(),
-//			OrmEmbeddedMappingDefinition.instance(),
-//			OrmEmbeddedIdMappingDefinition.instance(),
-//			OrmEclipseLinkTransformationMappingDefinition.instance(),
-//			OrmManyToManyMappingDefinition.instance(),
-//			OrmManyToOneMappingDefinition.instance(),
-//			OrmOneToManyMappingDefinition.instance(),
-//			OrmOneToOneMappingDefinition.instance(),
-//			OrmEclipseLinkVariableOneToOneMappingDefinition.instance(),
-//			NullOrmAttributeMappingDefinition.instance()};
-//	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaAnnotationDefinitionProvider.java
deleted file mode 100644
index ec0ee61ff2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaAnnotationDefinitionProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3;
-
-import java.util.ArrayList;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.core.internal.AbstractJpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicCollectionAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkBasicMapAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCacheAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkChangeTrackingAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConvertAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkCustomizerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkExistenceCheckingAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkJoinFetchAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkMutableAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkObjectTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrimaryKeyAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkPrivateOwnedAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadOnlyAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkReadTransformerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkStructConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTransformationAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkTypeConverterAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkVariableOneToOneAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.resource.java.EclipseLinkWriteTransformerAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.resource.java.EclipseLinkClassExtractor2_1AnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.EclipseLinkMultitenantAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.EclipseLinkTenantDiscriminatorColumnAnnotationDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.EclipseLinkTenantDiscriminatorColumnsAnnotationDefinition;
-
-/**
- * Provides annotations for 2.3 EclipseLink platform
- */
-public class EclipseLink2_3JpaAnnotationDefinitionProvider
-	extends AbstractJpaAnnotationDefinitionProvider
-{
-	// singleton
-	private static final JpaAnnotationDefinitionProvider INSTANCE = new EclipseLink2_3JpaAnnotationDefinitionProvider();
-
-	/**
-	 * Return the singleton
-	 */
-	public static JpaAnnotationDefinitionProvider instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink2_3JpaAnnotationDefinitionProvider() {
-		super();
-	}
-
-	@Override
-	protected void addAnnotationDefinitionsTo(ArrayList<AnnotationDefinition> definitions) {
-		CollectionTools.addAll(definitions, ANNOTATION_DEFINITIONS);
-	}
-
-	protected static final AnnotationDefinition[] ANNOTATION_DEFINITIONS = new AnnotationDefinition[] {
-		EclipseLinkBasicCollectionAnnotationDefinition.instance(),
-		EclipseLinkBasicMapAnnotationDefinition.instance(),
-		EclipseLinkCacheAnnotationDefinition.instance(),
-		EclipseLinkChangeTrackingAnnotationDefinition.instance(),
-		EclipseLinkClassExtractor2_1AnnotationDefinition.instance(),
-		EclipseLinkConvertAnnotationDefinition.instance(),
-		EclipseLinkConverterAnnotationDefinition.instance(),
-		EclipseLinkCustomizerAnnotationDefinition.instance(),
-		EclipseLinkExistenceCheckingAnnotationDefinition.instance(),
-		EclipseLinkJoinFetchAnnotationDefinition.instance(),
-		EclipseLinkMultitenantAnnotationDefinition.instance(),
-		EclipseLinkMutableAnnotationDefinition.instance(),
-		EclipseLinkObjectTypeConverterAnnotationDefinition.instance(),
-		EclipseLinkPrimaryKeyAnnotationDefinition.instance(),
-		EclipseLinkPrivateOwnedAnnotationDefinition.instance(),
-		EclipseLinkReadOnlyAnnotationDefinition.instance(),
-		EclipseLinkReadTransformerAnnotationDefinition.instance(),
-		EclipseLinkStructConverterAnnotationDefinition.instance(),
-		EclipseLinkTenantDiscriminatorColumnsAnnotationDefinition.instance(),
-		EclipseLinkTransformationAnnotationDefinition.instance(),
-		EclipseLinkTypeConverterAnnotationDefinition.instance(),
-		EclipseLinkVariableOneToOneAnnotationDefinition.instance(),
-		EclipseLinkWriteTransformerAnnotationDefinition.instance()
-	};
-
-	@Override
-	protected void addNestableAnnotationDefinitionsTo(ArrayList<NestableAnnotationDefinition> definitions) {
-		CollectionTools.addAll(definitions, NESTABLE_ANNOTATION_DEFINITIONS);
-	}
-
-	protected static final NestableAnnotationDefinition[]  NESTABLE_ANNOTATION_DEFINITIONS = new NestableAnnotationDefinition[] {
-		EclipseLinkTenantDiscriminatorColumnAnnotationDefinition.instance()
-	};
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaPlatformFactory.java
deleted file mode 100644
index 230750f071..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaPlatformFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3;
-
-import org.eclipse.jpt.common.core.AnnotationProvider;
-import org.eclipse.jpt.jpa.core.JpaFacet;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
-import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
-import org.eclipse.jpt.jpa.core.internal.jpa2.Generic2_0JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFactory.EclipseLinkVersion;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.EclipseLink2_0JpaFactory;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.EclipseLink2_0JpaPlatformFactory;
-
-
-public class EclipseLink2_3JpaPlatformFactory
-		extends EclipseLink2_0JpaPlatformFactory {
-	
-	/**
-	 * zero-argument constructor
-	 */
-	public EclipseLink2_3JpaPlatformFactory() {
-		super();
-	}
-	
-	
-	@Override
-	public JpaPlatform buildJpaPlatform(String id) {
-		return new GenericJpaPlatform(
-			id,
-			buildJpaVersion(),
-			new EclipseLink2_0JpaFactory(), 
-			buildAnnotationProvider(),
-			EclipseLink2_3JpaPlatformProvider.instance(), 
-			buildJpaVariation());
-	}
-	
-	@Override
-	protected JpaPlatform.Version buildJpaVersion() {
-		return new EclipseLinkVersion(
-				JptJpaEclipseLinkCorePlugin.ECLIPSELINK_PLATFORM_VERSION_2_3,
-				JpaFacet.VERSION_2_0.getVersionString());
-	}
-	
-	@Override
-	protected AnnotationProvider buildAnnotationProvider() {
-		return new JpaAnnotationProvider(
-				Generic2_0JpaAnnotationDefinitionProvider.instance(),
-				EclipseLink2_3JpaAnnotationDefinitionProvider.instance());
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaPlatformProvider.java
deleted file mode 100644
index 4a40d120f1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/EclipseLink2_3JpaPlatformProvider.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3;
-
-import java.util.ArrayList;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.common.utility.internal.CollectionTools;
-import org.eclipse.jpt.jpa.core.JpaPlatformProvider;
-import org.eclipse.jpt.jpa.core.ResourceDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.AbstractEclipseLink2_0JpaPlatformProvider;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaEmbeddableDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_1.context.orm.EclipseLinkOrmXml2_1Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_2.context.orm.EclipseLinkOrmXml2_2Definition;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.context.java.EclipseLinkJavaEntityDefinition2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.context.java.EclipseLinkJavaMappedSuperclassDefinition2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.context.orm.EclipseLinkOrmXml2_3Definition;
-
-
-public class EclipseLink2_3JpaPlatformProvider
-		extends AbstractEclipseLink2_0JpaPlatformProvider {
-	
-	// singleton
-	private static final JpaPlatformProvider INSTANCE = new EclipseLink2_3JpaPlatformProvider();
-	
-	
-	/**
-	 * Return the singleton
-	 */
-	public static JpaPlatformProvider instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLink2_3JpaPlatformProvider() {
-		super();
-	}
-	
-	
-	// ********** resource models **********
-	
-	@Override
-	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
-		if (contentType.equals(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) {
-			return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_3_RESOURCE_TYPE;
-		}
-		return super.getMostRecentSupportedResourceType(contentType);
-	}
-	
-	
-	// ********** resource definitions **********
-
-	@Override
-	protected void addResourceDefinitionsTo(ArrayList<ResourceDefinition> definitions) {
-		super.addResourceDefinitionsTo(definitions);
-		CollectionTools.addAll(definitions, RESOURCE_DEFINITIONS);
-	}
-
-	protected static final ResourceDefinition[] RESOURCE_DEFINITIONS = new ResourceDefinition[] {
-		EclipseLinkOrmXml2_1Definition.instance(),
-		EclipseLinkOrmXml2_2Definition.instance(),
-		EclipseLinkOrmXml2_3Definition.instance()
-	};
-
-	// ********* Java type mappings *********
-
-	@Override
-	protected void addJavaTypeMappingDefinitionsTo(ArrayList<JavaTypeMappingDefinition> definitions) {
-		CollectionTools.addAll(definitions, JAVA_TYPE_MAPPING_DEFINITIONS);
-	}
-
-	// order matches that used by EclipseLink
-	// NB: no EclipseLink-specific mappings
-	protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] {
-		EclipseLinkJavaEntityDefinition2_3.instance(),
-		EclipseLinkJavaEmbeddableDefinition2_0.instance(),
-		EclipseLinkJavaMappedSuperclassDefinition2_3.instance()
-	};
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/java/EclipseLinkJavaEntityDefinition2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/java/EclipseLinkJavaEntityDefinition2_3.java
deleted file mode 100644
index 29c87ef2e8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/java/EclipseLinkJavaEntityDefinition2_3.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaEntityDefinition2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLinkMultitenantAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLinkTenantDiscriminatorColumnAnnotation;
-
-public class EclipseLinkJavaEntityDefinition2_3
-	extends JavaTypeMappingDefinitionWrapper
-{
-	private static final JavaTypeMappingDefinition DELEGATE = EclipseLinkJavaEntityDefinition2_0.instance();
-
-	// singleton
-	private static final JavaTypeMappingDefinition INSTANCE = new EclipseLinkJavaEntityDefinition2_3();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaEntityDefinition2_3() {
-		super();
-	}
-
-	@Override
-	protected JavaTypeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	public static final String[] ECLIPSE_LINK2_3_SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
-		EclipseLinkMultitenantAnnotation.ANNOTATION_NAME,
-		EclipseLinkTenantDiscriminatorColumnAnnotation.ANNOTATION_NAME,
-		EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMNS
-	};
-	public static final Iterable<String> ECLIPSE_LINK2_3_SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(ECLIPSE_LINK2_3_SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		ECLIPSE_LINK2_3_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/java/EclipseLinkJavaMappedSuperclassDefinition2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/java/EclipseLinkJavaMappedSuperclassDefinition2_3.java
deleted file mode 100644
index 1e06ef399e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/java/EclipseLinkJavaMappedSuperclassDefinition2_3.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.context.java;
-
-import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_0.context.java.EclipseLinkJavaMappedSuperclassDefinition2_0;
-
-public class EclipseLinkJavaMappedSuperclassDefinition2_3
-	extends JavaTypeMappingDefinitionWrapper
-{
-	private static final JavaTypeMappingDefinition DELEGATE = EclipseLinkJavaMappedSuperclassDefinition2_0.instance();
-
-	// singleton
-	private static final JavaTypeMappingDefinition INSTANCE = new EclipseLinkJavaMappedSuperclassDefinition2_3();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static JavaTypeMappingDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkJavaMappedSuperclassDefinition2_3() {
-		super();
-	}
-
-	@Override
-	protected JavaTypeMappingDefinition getDelegate() {
-		return DELEGATE;
-	}
-
-	@Override
-	public Iterable<String> getSupportingAnnotationNames() {
-		return COMBINED_SUPPORTING_ANNOTATION_NAMES;
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
-		DELEGATE.getSupportingAnnotationNames(),
-		EclipseLinkJavaEntityDefinition2_3.ECLIPSE_LINK2_3_SUPPORTING_ANNOTATION_NAMES
-	);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/orm/EclipseLinkOrmXml2_3Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/orm/EclipseLinkOrmXml2_3Definition.java
deleted file mode 100644
index 3c4279653e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/context/orm/EclipseLinkOrmXml2_3Definition.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.context.orm;
-
-import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_2.context.orm.EclipseLinkOrmXml2_2Definition;
-
-
-public class EclipseLinkOrmXml2_3Definition
-		extends EclipseLinkOrmXml2_2Definition {
-	
-	// singleton
-	private static final OrmXmlDefinition INSTANCE = new EclipseLinkOrmXml2_3Definition();
-	
-	
-	/**
-	 * Return the singleton.
-	 */
-	public static OrmXmlDefinition instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkOrmXml2_3Definition() {
-		super();
-	}
-	
-	
-	@Override
-	public JptResourceType getResourceType() {
-		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_2_3_RESOURCE_TYPE;
-	}
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkMultitenantAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkMultitenantAnnotationDefinition.java
deleted file mode 100644
index 08d5e924ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkMultitenantAnnotationDefinition.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.binary.BinaryEclipseLinkMultitenantAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.source.SourceEclipseLinkMultitenantAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLinkMultitenantAnnotation;
-
-public class EclipseLinkMultitenantAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE 
-			= new EclipseLinkMultitenantAnnotationDefinition();
-	
-	
-	/**
-	 * Return the singleton
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-	
-	
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkMultitenantAnnotationDefinition() {
-		super();
-	}
-	
-	
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceEclipseLinkMultitenantAnnotation(parent, annotatedElement);
-	}
-	
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-	
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryEclipseLinkMultitenantAnnotation(parent, jdtAnnotation);
-	}
-	
-	public String getAnnotationName() {
-		return EclipseLinkMultitenantAnnotation.ANNOTATION_NAME;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnAnnotationDefinition.java
deleted file mode 100644
index ccf019f87d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnAnnotationDefinition.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.binary.BinaryEclipseLinkTenantDiscriminatorColumnAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.source.SourceEclipseLinkTenantDiscriminatorColumnAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLinkTenantDiscriminatorColumnAnnotation;
-
-public class EclipseLinkTenantDiscriminatorColumnAnnotationDefinition
-	implements NestableAnnotationDefinition
-{
-	// singleton
-	private static final NestableAnnotationDefinition INSTANCE 
-			= new EclipseLinkTenantDiscriminatorColumnAnnotationDefinition();
-
-
-	/**
-	 * Return the singleton
-	 */
-	public static NestableAnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-
-	/**
-	 * Enforce singleton usage
-	 */
-	private EclipseLinkTenantDiscriminatorColumnAnnotationDefinition() {
-		super();
-	}
-
-	public NestableAnnotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement, int index) {
-		return SourceEclipseLinkTenantDiscriminatorColumnAnnotation.buildSourceTenantDiscriminatorColumnAnnotation(parent, annotatedElement, index);
-	}
-
-	public NestableAnnotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation, int index) {
-		return new BinaryEclipseLinkTenantDiscriminatorColumnAnnotation(parent, jdtAnnotation);
-	}
-
-	public String getNestableAnnotationName() {
-		return EclipseLinkTenantDiscriminatorColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	public String getContainerAnnotationName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMNS;
-	}
-
-	public String getElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMNS__VALUE;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnsAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnsAnnotationDefinition.java
deleted file mode 100644
index e2777a4251..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnsAnnotationDefinition.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryNamedAnnotation;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceNamedAnnotation;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLink2_3;
-
-public final class EclipseLinkTenantDiscriminatorColumnsAnnotationDefinition
-	implements AnnotationDefinition
-{
-	// singleton
-	private static final AnnotationDefinition INSTANCE = new EclipseLinkTenantDiscriminatorColumnsAnnotationDefinition();
-
-	/**
-	 * Return the singleton.
-	 */
-	public static AnnotationDefinition instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Ensure single instance.
-	 */
-	private EclipseLinkTenantDiscriminatorColumnsAnnotationDefinition() {
-		super();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement annotatedElement) {
-		return new SourceNamedAnnotation(parent, annotatedElement, getAnnotationName());
-	}
-
-	public Annotation buildNullAnnotation(JavaResourceAnnotatedElement parent) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Annotation buildAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		return new BinaryNamedAnnotation(parent, jdtAnnotation, getAnnotationName());
-	}
-
-	public String getAnnotationName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMNS;
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/binary/BinaryEclipseLinkMultitenantAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/binary/BinaryEclipseLinkMultitenantAnnotation.java
deleted file mode 100644
index 609d7fbaff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/binary/BinaryEclipseLinkMultitenantAnnotation.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLinkMultitenantAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.MultitenantType;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_4.resource.java.EclipseLink2_4;
-
-/**
- * org.eclipse.persistence.annotations.Multitenant
- */
-public class BinaryEclipseLinkMultitenantAnnotation
-	extends BinaryAnnotation
-	implements EclipseLinkMultitenantAnnotation
-{
-	private MultitenantType value;
-	private Boolean includeCriteria;
-
-
-	public BinaryEclipseLinkMultitenantAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.value = this.buildValue();
-		this.includeCriteria = this.buildIncludeCriteria();
-	}
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setValue_(this.buildValue());
-		this.setIncludeCriteria_(this.buildIncludeCriteria());
-	}
-
-
-	// ********** EclipseLinkMultitenantAnnotation implementation **********
-
-	// ***** value
-	public MultitenantType getValue() {
-		return this.value;
-	}
-
-	public void setValue(MultitenantType value) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setValue_(MultitenantType value) {
-		MultitenantType old = this.value;
-		this.value = value;
-		this.firePropertyChanged(VALUE_PROPERTY, old, value);
-	}
-
-	private MultitenantType buildValue() {
-		return MultitenantType.fromJavaAnnotationValue(this.getJdtMemberValue(EclipseLink.JOIN_FETCH__VALUE));
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** include criteria
-	public Boolean getIncludeCriteria() {
-		return this.includeCriteria;
-	}
-
-	public void setIncludeCriteria(Boolean includeCriteria) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setIncludeCriteria_(Boolean includeCriteria) {
-		Boolean old = this.includeCriteria;
-		this.includeCriteria = includeCriteria;
-		this.firePropertyChanged(INCLUDE_CRITERIA_PROPERTY, old, includeCriteria);
-	}
-
-	private Boolean buildIncludeCriteria() {
-		return (Boolean) this.getJdtMemberValue(EclipseLink2_4.MULTITENANT__INCLUDE_CRITERIA);
-	}
-
-	public TextRange getIncludeCriteriaTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/binary/BinaryEclipseLinkTenantDiscriminatorColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/binary/BinaryEclipseLinkTenantDiscriminatorColumnAnnotation.java
deleted file mode 100644
index 7913190259..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/binary/BinaryEclipseLinkTenantDiscriminatorColumnAnnotation.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.binary;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryBaseDiscriminatorColumnAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLinkTenantDiscriminatorColumnAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.TenantDiscriminatorColumn
- */
-public class BinaryEclipseLinkTenantDiscriminatorColumnAnnotation
-	extends BinaryBaseDiscriminatorColumnAnnotation
-	implements EclipseLinkTenantDiscriminatorColumnAnnotation
-{
-	private String contextProperty;
-	private String table;
-	private Boolean primaryKey;
-
-	public BinaryEclipseLinkTenantDiscriminatorColumnAnnotation(JavaResourceAnnotatedElement parent, IAnnotation jdtAnnotation) {
-		super(parent, jdtAnnotation);
-		this.contextProperty = this.buildContextProperty();
-		this.table = this.buildTable();
-		this.primaryKey = this.buildPrimaryKey();
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkTenantDiscriminatorColumnAnnotation.ANNOTATION_NAME;
-	}
-
-	@Override
-	public void update() {
-		super.update();
-		this.setContextProperty_(this.buildContextProperty());
-		this.setTable_(this.buildTable());
-		this.setPrimaryKey_(this.buildPrimaryKey());
-	}
-
-	// ********** BinaryBaseDiscriminatorColumnAnnotation implementation **********
-
-	@Override
-	protected String getDiscriminatorTypeElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE;
-	}
-
-	@Override
-	protected String getLengthElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__LENGTH;
-	}
-
-	// ********** BinaryNamedColumnAnnotation implementation **********
-
-	@Override
-	protected String getNameElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__NAME;
-	}
-
-	@Override
-	protected String getColumnDefinitionElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__COLUMN_DEFINITION;
-	}
-
-
-	//************* EclipseLinkTenantDiscriminatorColumnAnnotation implementation *************
-
-	// ***** contextProperty
-	public String getContextProperty() {
-		return this.contextProperty;
-	}
-
-	public void setContextProperty(String contextProperty) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setContextProperty_(String contextProperty) {
-		String old = this.contextProperty;
-		this.contextProperty = contextProperty;
-		this.firePropertyChanged(CONTEXT_PROPERTY_PROPERTY, old, contextProperty);
-	}
-
-	private String buildContextProperty() {
-		return (String) this.getJdtMemberValue(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY);
-	}
-
-	public TextRange getContextPropertyTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** table
-	public String getTable() {
-		return this.table;
-	}
-
-	public void setTable(String table) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setTable_(String table) {
-		String old = this.table;
-		this.table = table;
-		this.firePropertyChanged(TABLE_PROPERTY, old, table);
-	}
-
-	private String buildTable() {
-		return (String) this.getJdtMemberValue(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__TABLE);
-	}
-
-	public TextRange getTableTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	public boolean tableTouches(int pos, CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-	// ***** primaryKey
-	public Boolean getPrimaryKey() {
-		return this.primaryKey;
-	}
-
-	public void setPrimaryKey(Boolean primaryKey) {
-		throw new UnsupportedOperationException();
-	}
-
-	private void setPrimaryKey_(Boolean primaryKey) {
-		Boolean old = this.primaryKey;
-		this.primaryKey = primaryKey;
-		this.firePropertyChanged(PRIMARY_KEY_PROPERTY, old, primaryKey);
-	}
-
-	private Boolean buildPrimaryKey() {
-		return (Boolean) this.getJdtMemberValue(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY);
-	}
-
-	public TextRange getPrimaryKeyTextRange(CompilationUnit astRoot) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/source/SourceEclipseLinkMultitenantAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/source/SourceEclipseLinkMultitenantAnnotation.java
deleted file mode 100644
index 55273b34c3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/source/SourceEclipseLinkMultitenantAnnotation.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.resource.java.source.SourceAnnotation;
-import org.eclipse.jpt.common.core.internal.utility.jdt.AnnotatedElementAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.BooleanExpressionConverter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ConversionDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLinkMultitenantAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.MultitenantType;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_4.resource.java.EclipseLink2_4;
-
-/**
- * org.eclipse.persistence.annotations.Multitenant
- */
-public class SourceEclipseLinkMultitenantAnnotation
-	extends SourceAnnotation
-	implements EclipseLinkMultitenantAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER 
-			= new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
-
-	private static final DeclarationAnnotationElementAdapter<String> VALUE_ADAPTER = buildValueAdapter();
-	private final AnnotationElementAdapter<String> valueAdapter;
-	private MultitenantType value;
-
-	private static final DeclarationAnnotationElementAdapter<Boolean> INCLUDE_CRITERIA_ADAPTER = buildIncludeCriteriaAdapter();
-	private final AnnotationElementAdapter<Boolean> includeCriteriaAdapter;
-	private Boolean includeCriteria;
-
-	public SourceEclipseLinkMultitenantAnnotation(JavaResourceAnnotatedElement parent, AnnotatedElement element) {
-		super(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-		this.valueAdapter = new AnnotatedElementAnnotationElementAdapter<String>(element, VALUE_ADAPTER);
-		this.includeCriteriaAdapter = new AnnotatedElementAnnotationElementAdapter<Boolean>(element, INCLUDE_CRITERIA_ADAPTER);
-	}
-
-
-	public String getAnnotationName() {
-		return ANNOTATION_NAME;
-	}
-
-	public void initialize(CompilationUnit astRoot) {
-		this.value = this.buildValue(astRoot);
-		this.includeCriteria = this.buildIncludeCriteria(astRoot);
-	}
-
-	public void synchronizeWith(CompilationUnit astRoot) {
-		this.syncValue(this.buildValue(astRoot));
-		this.syncIncludeCriteria(this.buildIncludeCriteria(astRoot));
-	}
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.value == null) &&
-				(this.includeCriteria == null);
-	}
-
-	@Override
-	public void toString(StringBuilder sb) {
-		sb.append(this.value);
-	}
-
-	// ********** MultitenantAnnotation implementation **********
-
-	// ***** value
-	public MultitenantType getValue() {
-		return this.value;
-	}
-
-	public void setValue(MultitenantType value) {
-		if (this.attributeValueHasChanged(this.value, value)) {
-			this.value = value;
-			this.valueAdapter.setValue(MultitenantType.toJavaAnnotationValue(value));
-		}
-	}
-
-	private void syncValue(MultitenantType astValue) {
-		MultitenantType old = this.value;
-		this.value = astValue;
-		this.firePropertyChanged(VALUE_PROPERTY, old, astValue);
-	}
-
-	private MultitenantType buildValue(CompilationUnit astRoot) {
-		return MultitenantType.fromJavaAnnotationValue(this.valueAdapter.getValue(astRoot));
-	}
-
-	public TextRange getValueTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(VALUE_ADAPTER, astRoot);
-	}
-
-	// ***** include criteria
-	public Boolean getIncludeCriteria() {
-		return this.includeCriteria;
-	}
-
-	public void setIncludeCriteria(Boolean includeCriteria) {
-		if (this.attributeValueHasChanged(this.includeCriteria, includeCriteria)) {
-			this.includeCriteria = includeCriteria;
-			this.includeCriteriaAdapter.setValue(includeCriteria);
-		}
-	}
-
-	private void syncIncludeCriteria(Boolean astIncludeCriteria) {
-		Boolean old = this.includeCriteria;
-		this.includeCriteria = astIncludeCriteria;
-		this.firePropertyChanged(INCLUDE_CRITERIA_PROPERTY, old, astIncludeCriteria);
-	}
-
-	private Boolean buildIncludeCriteria(CompilationUnit astRoot) {
-		return this.includeCriteriaAdapter.getValue(astRoot);
-	}
-
-	public TextRange getIncludeCriteriaTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(INCLUDE_CRITERIA_ADAPTER, astRoot);
-	}
-
-
-	// ********** static methods **********
-
-	private static DeclarationAnnotationElementAdapter<String> buildValueAdapter() {
-		return new EnumDeclarationAnnotationElementAdapter(DECLARATION_ANNOTATION_ADAPTER, EclipseLink2_3.MULTITENANT__VALUE);
-	}
-
-	private static DeclarationAnnotationElementAdapter<Boolean> buildIncludeCriteriaAdapter() {
-		return new ConversionDeclarationAnnotationElementAdapter<Boolean>(DECLARATION_ANNOTATION_ADAPTER, EclipseLink2_4.MULTITENANT__INCLUDE_CRITERIA, BooleanExpressionConverter.instance());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/source/SourceEclipseLinkTenantDiscriminatorColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/source/SourceEclipseLinkTenantDiscriminatorColumnAnnotation.java
deleted file mode 100644
index ac4a0bc424..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/v2_3/resource/java/source/SourceEclipseLinkTenantDiscriminatorColumnAnnotation.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.internal.v2_3.resource.java.source;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.internal.utility.jdt.CombinationIndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ElementAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.ElementIndexedAnnotationAdapter;
-import org.eclipse.jpt.common.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement;
-import org.eclipse.jpt.common.core.resource.java.JavaResourceNode;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.IndexedAnnotationAdapter;
-import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
-import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceBaseDiscriminatorColumnAnnotation;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java.EclipseLinkTenantDiscriminatorColumnAnnotation;
-
-/**
- * org.eclipse.persistence.annotations.TenantDiscriminatorColumn
- */
-public class SourceEclipseLinkTenantDiscriminatorColumnAnnotation
-	extends SourceBaseDiscriminatorColumnAnnotation
-	implements EclipseLinkTenantDiscriminatorColumnAnnotation
-{
-	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(EclipseLinkTenantDiscriminatorColumnAnnotation.ANNOTATION_NAME);
-	private static final DeclarationAnnotationAdapter CONTAINER_DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMNS);
-
-	protected DeclarationAnnotationElementAdapter<String> contextPropertyDeclarationAdapter;
-	protected AnnotationElementAdapter<String> contextPropertyAdapter;
-	protected String contextProperty;
-
-	protected DeclarationAnnotationElementAdapter<String> tableDeclarationAdapter;
-	protected AnnotationElementAdapter<String> tableAdapter;
-	protected String table;
-
-	protected DeclarationAnnotationElementAdapter<Boolean> primaryKeyDeclarationAdapter;
-	protected AnnotationElementAdapter<Boolean> primaryKeyAdapter;
-	protected Boolean primaryKey;
-
-	public static SourceEclipseLinkTenantDiscriminatorColumnAnnotation buildSourceTenantDiscriminatorColumnAnnotation(
-			JavaResourceNode parent, 
-			AnnotatedElement element) {
-
-		return new SourceEclipseLinkTenantDiscriminatorColumnAnnotation(parent, element, DECLARATION_ANNOTATION_ADAPTER);
-	}
-
-	public static SourceEclipseLinkTenantDiscriminatorColumnAnnotation buildSourceTenantDiscriminatorColumnAnnotation(
-			JavaResourceAnnotatedElement parent, 
-			AnnotatedElement annotatedElement, 
-			int index) {
-		IndexedDeclarationAnnotationAdapter idaa = buildTenantDiscriminatorColumnDeclarationAnnotationAdapter(index);
-		IndexedAnnotationAdapter iaa = buildTenantDiscriminatorColumnAnnotationAdapter(annotatedElement, idaa);
-		return new SourceEclipseLinkTenantDiscriminatorColumnAnnotation(
-			parent,
-			annotatedElement,
-			idaa,
-			iaa);
-	}
-
-
-	public static SourceEclipseLinkTenantDiscriminatorColumnAnnotation buildNestedSourceTenantDiscriminatorColumnAnnotation(
-			JavaResourceNode parent, 
-			AnnotatedElement element, 
-			IndexedDeclarationAnnotationAdapter idaa) {
-		
-		return new SourceEclipseLinkTenantDiscriminatorColumnAnnotation(parent, element, idaa);
-	}
-
-	private SourceEclipseLinkTenantDiscriminatorColumnAnnotation(JavaResourceNode parent, AnnotatedElement element, DeclarationAnnotationAdapter daa) {
-		this(parent, element, daa, new ElementAnnotationAdapter(element, daa));
-	}
-
-	private SourceEclipseLinkTenantDiscriminatorColumnAnnotation(JavaResourceNode parent, AnnotatedElement element, IndexedDeclarationAnnotationAdapter idaa) {
-		this(parent, element, idaa, new ElementIndexedAnnotationAdapter(element, idaa));
-	}
-
-	private SourceEclipseLinkTenantDiscriminatorColumnAnnotation(JavaResourceNode parent, AnnotatedElement element, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) {
-		super(parent, element, daa, annotationAdapter);
-		this.contextPropertyDeclarationAdapter = this.buildContextPropertyDeclarationAdapter();
-		this.contextPropertyAdapter = this.buildContextPropertyAdapter();
-		this.tableDeclarationAdapter = this.buildTableDeclarationAdapter();
-		this.tableAdapter = this.buildTableAdapter();
-		this.primaryKeyDeclarationAdapter = this.buildPrimaryKeyDeclarationAdapter();
-		this.primaryKeyAdapter = this.buildPrimaryKeyAdapter();
-	}
-
-	@Override
-	public void initialize(CompilationUnit astRoot) {
-		super.initialize(astRoot);
-		this.contextProperty = this.buildContextProperty(astRoot);
-		this.table = this.buildTable(astRoot);
-		this.primaryKey = this.buildPrimaryKey(astRoot);
-	}
-
-	@Override
-	public void synchronizeWith(CompilationUnit astRoot) {
-		super.synchronizeWith(astRoot);
-		this.syncContextProperty(this.buildContextProperty(astRoot));
-		this.syncTable(this.buildTable(astRoot));
-		this.syncPrimaryKey(this.buildPrimaryKey(astRoot));
-	}
-
-	public String getAnnotationName() {
-		return EclipseLinkTenantDiscriminatorColumnAnnotation.ANNOTATION_NAME;
-	}
-
-
-	// ********** SourceNamedColumnAnnotation implementation **********
-
-	@Override
-	protected String getNameElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__NAME;
-	}
-
-	@Override
-	protected String getColumnDefinitionElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__COLUMN_DEFINITION;
-	}
-
-
-	//************* SourceBaseDiscriminatorColumnAnnotation implementation *************
-
-	@Override
-	protected String getDiscriminatorTypeElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE;
-	}
-
-	@Override
-	protected String getLengthElementName() {
-		return EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__LENGTH;
-	}
-
-
-	//************* TenantDiscriminatorColumnAnnotation implementation *************
-
-	// ***** contextProperty
-	public String getContextProperty() {
-		return this.contextProperty;
-	}
-
-	public void setContextProperty(String contextProperty) {
-		if (this.attributeValueHasChanged(this.contextProperty, contextProperty)) {
-			this.contextProperty = contextProperty;
-			this.contextPropertyAdapter.setValue(contextProperty);
-		}
-	}
-
-	private void syncContextProperty(String astContextProperty) {
-		String old = this.contextProperty;
-		this.contextProperty = astContextProperty;
-		this.firePropertyChanged(CONTEXT_PROPERTY_PROPERTY, old, astContextProperty);
-	}
-
-	private String buildContextProperty(CompilationUnit astRoot) {
-		return this.contextPropertyAdapter.getValue(astRoot);
-	}
-
-	public TextRange getContextPropertyTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.contextPropertyDeclarationAdapter, astRoot);
-	}
-
-	private DeclarationAnnotationElementAdapter<String> buildContextPropertyDeclarationAdapter() {
-		return this.buildStringElementAdapter(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY);
-	}
-
-	private AnnotationElementAdapter<String> buildContextPropertyAdapter() {
-		return this.buildStringElementAdapter(this.contextPropertyDeclarationAdapter);
-	}
-
-	// ***** table
-	public String getTable() {
-		return this.table;
-	}
-
-	public void setTable(String table) {
-		if (this.attributeValueHasChanged(this.table, table)) {
-			this.table = table;
-			this.tableAdapter.setValue(table);
-		}
-	}
-
-	private void syncTable(String astTable) {
-		String old = this.table;
-		this.table = astTable;
-		this.firePropertyChanged(TABLE_PROPERTY, old, astTable);
-	}
-
-	private String buildTable(CompilationUnit astRoot) {
-		return this.tableAdapter.getValue(astRoot);
-	}
-
-	public TextRange getTableTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.tableDeclarationAdapter, astRoot);
-	}
-
-	public boolean tableTouches(int pos, CompilationUnit astRoot) {
-		return this.elementTouches(this.tableDeclarationAdapter, pos, astRoot);
-	}
-
-	private DeclarationAnnotationElementAdapter<String> buildTableDeclarationAdapter() {
-		return this.buildStringElementAdapter(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__TABLE);
-	}
-
-	private AnnotationElementAdapter<String> buildTableAdapter() {
-		return this.buildStringElementAdapter(this.tableDeclarationAdapter);
-	}
-
-	// ***** primaryKey
-	public Boolean getPrimaryKey() {
-		return this.primaryKey;
-	}
-
-	public void setPrimaryKey(Boolean primaryKey) {
-		if (this.attributeValueHasChanged(this.primaryKey, primaryKey)) {
-			this.primaryKey = primaryKey;
-			this.primaryKeyAdapter.setValue(primaryKey);
-		}
-	}
-
-	private void syncPrimaryKey(Boolean astPrimaryKey) {
-		Boolean old = this.primaryKey;
-		this.primaryKey = astPrimaryKey;
-		this.firePropertyChanged(PRIMARY_KEY_PROPERTY, old, astPrimaryKey);
-	}
-
-	private Boolean buildPrimaryKey(CompilationUnit astRoot) {
-		return this.primaryKeyAdapter.getValue(astRoot);
-	}
-
-	public TextRange getPrimaryKeyTextRange(CompilationUnit astRoot) {
-		return this.getElementTextRange(this.primaryKeyDeclarationAdapter, astRoot);
-	}
-
-	private DeclarationAnnotationElementAdapter<Boolean> buildPrimaryKeyDeclarationAdapter() {
-		return this.buildBooleanElementAdapter(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY);
-	}
-
-	private AnnotationElementAdapter<Boolean> buildPrimaryKeyAdapter() {
-		return this.buildBooleanElementAdapter(this.primaryKeyDeclarationAdapter);
-	}
-
-
-	// ********** misc **********
-
-	@Override
-	public boolean isUnset() {
-		return super.isUnset() &&
-				(this.contextProperty == null) &&
-				(this.primaryKey == null) &&
-				(this.table == null);
-	}
-
-	// ********** static methods **********
-
-	private static IndexedAnnotationAdapter buildTenantDiscriminatorColumnAnnotationAdapter(AnnotatedElement annotatedElement, IndexedDeclarationAnnotationAdapter idaa) {
-		return new ElementIndexedAnnotationAdapter(annotatedElement, idaa);
-	}
-
-	private static IndexedDeclarationAnnotationAdapter buildTenantDiscriminatorColumnDeclarationAnnotationAdapter(int index) {
-		IndexedDeclarationAnnotationAdapter idaa = 
-			new CombinationIndexedDeclarationAnnotationAdapter(
-				DECLARATION_ANNOTATION_ADAPTER,
-				CONTAINER_DECLARATION_ANNOTATION_ADAPTER,
-				index,
-				EclipseLinkTenantDiscriminatorColumnAnnotation.ANNOTATION_NAME);
-		return idaa;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/platform/EclipseLinkPlatform.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/platform/EclipseLinkPlatform.java
deleted file mode 100644
index 807cb5ef4d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/platform/EclipseLinkPlatform.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jpt.jpa.eclipselink.core.platform;
-
-import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
-import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription;
-import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupDescription;
-
-/**
- * Constants pertaining to the EclipseLink JPA platforms and their group
- * 
- * 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.
- * 
- * @version 3.0
- * @since 3.0
- */
-public class EclipseLinkPlatform {
-	
-	public static final JpaPlatformGroupDescription GROUP
-			= JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatformGroup("eclipselink"); //$NON-NLS-1$
-	
-	public static final JpaPlatformDescription VERSION_1_0
-			= JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatform("org.eclipse.eclipselink.platform"); //$NON-NLS-1$
-	
-	public static final JpaPlatformDescription VERSION_1_1
-			= JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatform("eclipselink1_1"); //$NON-NLS-1$
-	
-	public static final JpaPlatformDescription VERSION_1_2
-			= JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatform("eclipselink1_2"); //$NON-NLS-1$
-	
-	public static final JpaPlatformDescription VERSION_2_0
-			= JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatform("eclipselink2_0"); //$NON-NLS-1$
-	
-	public static final JpaPlatformDescription VERSION_2_1
-			= JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatform("eclipselink2_1"); //$NON-NLS-1$
-	
-	public static final JpaPlatformDescription VERSION_2_2
-			= JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatform("eclipselink2_2"); //$NON-NLS-1$
-	
-	public static final JpaPlatformDescription VERSION_2_3
-			= JptJpaCorePlugin.getJpaPlatformManager().getJpaPlatform("eclipselink2_3"); //$NON-NLS-1$
-	
-	
-	/**
-	 * Not for instantiation
-	 */
-	private EclipseLinkPlatform() {}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/BaseEclipseLinkTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/BaseEclipseLinkTypeConverterAnnotation.java
deleted file mode 100644
index 33272083e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/BaseEclipseLinkTypeConverterAnnotation.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Common protocol among:
- *     org.eclipse.persistence.annotations.TypeConverter
- *     org.eclipse.persistence.annotations.ObjectTypeConverter
- * 
- * 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 interface BaseEclipseLinkTypeConverterAnnotation
-	extends EclipseLinkNamedConverterAnnotation
-{
-	/**
-	 * Corresponds to the 'dataType' element of the TypeConverter annotation.
-	 * Returns null if the element does not exist in Java.
-	 */
-	String getDataType();
-		String DATA_TYPE_PROPERTY = "dataType"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'dataType' element of the TypeConverter annotation.
-	 * Set to null to remove the element.
-	 */
-	void setDataType(String dataType);
-	
-	/**
-	 * Return the {@link TextRange} for the 'dataType' element. If the element 
-	 * does not exist return the {@link TextRange} for the TypeConverter annotation.
-	 */
-	TextRange getDataTypeTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the fully-qualified data type name as resolved by the
-	 * AST's bindings.
-	 * <pre>
-	 *     &#64;TypeConverter(dataType = MyDataType.class)
-	 * </pre>
-	 * will return <code>"model.MyDataType"</code> if there is an import for
-	 * <code>model.MyDataType</code>.
-	 */
-	String getFullyQualifiedDataType();
-
-	/**
-	 * Corresponds to the 'objectType' element of the TypeConverter annotation.
-	 * Returns null if the element does not exist in Java.
-	 */
-	String getObjectType();
-		String OBJECT_TYPE_PROPERTY = "objectType"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'objectType' element of the TypeConverter annotation.
-	 * Set to null to remove the element.
-	 */
-	void setObjectType(String objectType);
-	
-	/**
-	 * Return the {@link TextRange} for the 'objectType' element. If the element 
-	 * does not exist return the {@link TextRange} for the TypeConverter annotation.
-	 */
-	TextRange getObjectTypeTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the fully-qualified object type name as resolved by the
-	 * AST's bindings.
-	 * <pre>
-	 *     &#64;TypeConverter(dataType = MyObjectType.class)
-	 * </pre>
-	 * will return <code>"model.MyObjectType"</code> if there is an import for
-	 * <code>model.MyObjectType</code>.
-	 */
-	String getFullyQualifiedObjectType();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/CacheCoordinationType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/CacheCoordinationType.java
deleted file mode 100644
index c7cdae36a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/CacheCoordinationType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-/**
- * Corresponds to the EclipseLink enum
- * org.eclipse.persistence.annotations.CacheCoordinationType
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum CacheCoordinationType {
-
-	SEND_OBJECT_CHANGES(EclipseLink.CACHE_COORDINATION_TYPE__SEND_OBJECT_CHANGES),
-	INVALIDATE_CHANGED_OBJECTS(EclipseLink.CACHE_COORDINATION_TYPE__INVALIDATE_CHANGED_OBJECTS),
-	SEND_NEW_OBJECTS_WITH_CHANGES(EclipseLink.CACHE_COORDINATION_TYPE__SEND_NEW_OBJECTS_WITH_CHANGES),
-	NONE(EclipseLink.CACHE_COORDINATION_TYPE__NONE);
-
-
-	private String javaAnnotationValue;
-
-	CacheCoordinationType(String javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			throw new NullPointerException();
-		}
-		this.javaAnnotationValue = javaAnnotationValue;
-	}
-
-	public String getJavaAnnotationValue() {
-		return this.javaAnnotationValue;
-	}
-
-
-	// ********** static methods **********
-
-	public static CacheCoordinationType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue);
-	}
-
-	private static CacheCoordinationType fromJavaAnnotationValue_(Object javaAnnotationValue) {
-		for (CacheCoordinationType cacheCoordinationType : CacheCoordinationType.values()) {
-			if (cacheCoordinationType.getJavaAnnotationValue().equals(javaAnnotationValue)) {
-				return cacheCoordinationType;
-			}
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(CacheCoordinationType cacheCoordinationType) {
-		return (cacheCoordinationType == null) ? null : cacheCoordinationType.getJavaAnnotationValue();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/CacheType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/CacheType.java
deleted file mode 100644
index 6f5dd969a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/CacheType.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-/**
- * Corresponds to the EclipseLink enum
- * org.eclipse.persistence.annotations.CacheType
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum CacheType {
-
-	FULL(EclipseLink.CACHE_TYPE__FULL),
-	WEAK(EclipseLink.CACHE_TYPE__WEAK),
-	SOFT(EclipseLink.CACHE_TYPE__SOFT),
-	SOFT_WEAK(EclipseLink.CACHE_TYPE__SOFT_WEAK),
-	HARD_WEAK(EclipseLink.CACHE_TYPE__HARD_WEAK),
-	CACHE(EclipseLink.CACHE_TYPE__CACHE),
-	NONE(EclipseLink.CACHE_TYPE__NONE);
-
-
-	private String javaAnnotationValue;
-
-	CacheType(String javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			throw new NullPointerException();
-		}
-		this.javaAnnotationValue = javaAnnotationValue;
-	}
-
-	public String getJavaAnnotationValue() {
-		return this.javaAnnotationValue;
-	}
-
-
-	// ********** static methods **********
-
-	public static CacheType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue);
-	}
-
-	private static CacheType fromJavaAnnotationValue_(Object javaAnnotationValue) {
-		for (CacheType cacheType : CacheType.values()) {
-			if (cacheType.getJavaAnnotationValue().equals(javaAnnotationValue)) {
-				return cacheType;
-			}
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(CacheType cacheType) {
-		return (cacheType == null) ? null : cacheType.getJavaAnnotationValue();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/ChangeTrackingType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/ChangeTrackingType.java
deleted file mode 100644
index f9dac5d315..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/ChangeTrackingType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-/**
- * Corresponds to the EclipseLink enum
- * org.eclipse.persistence.annotations.ChangeTrackingType
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum ChangeTrackingType {
-
-	ATTRIBUTE(EclipseLink.CHANGE_TRACKING_TYPE__ATTRIBUTE),
-	OBJECT(EclipseLink.CHANGE_TRACKING_TYPE__OBJECT),
-	DEFERRED(EclipseLink.CHANGE_TRACKING_TYPE__DEFERRED),
-	AUTO(EclipseLink.CHANGE_TRACKING_TYPE__AUTO);
-
-
-	private String javaAnnotationValue;
-
-	ChangeTrackingType(String javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			throw new NullPointerException();
-		}
-		this.javaAnnotationValue = javaAnnotationValue;
-	}
-
-	public String getJavaAnnotationValue() {
-		return this.javaAnnotationValue;
-	}
-
-
-	// ********** static methods **********
-
-	public static ChangeTrackingType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue);
-	}
-
-	private static ChangeTrackingType fromJavaAnnotationValue_(Object javaAnnotationValue) {
-		for (ChangeTrackingType changeTrackingType : ChangeTrackingType.values()) {
-			if (changeTrackingType.getJavaAnnotationValue().equals(javaAnnotationValue)) {
-				return changeTrackingType;
-			}
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(ChangeTrackingType changeTrackingType) {
-		return (changeTrackingType == null) ? null : changeTrackingType.getJavaAnnotationValue();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLink.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLink.java
deleted file mode 100644
index 8cff21359a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLink.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-/**
- * EclipseLink Java-related stuff (annotations etc.)
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-@SuppressWarnings("nls")
-public interface EclipseLink {
-
-	// EclipseLink package
-	String PACKAGE = "org.eclipse.persistence.annotations"; //$NON-NLS-1$
-	String PACKAGE_ = PACKAGE + ".";
-
-
-	// ********** API **********
-
-	// EclispeLink annotations
-	String BASIC_COLLECTION = PACKAGE_ + "BasicCollection";
-	String BASIC_MAP = PACKAGE_ + "BasicMap";
-	String CACHE = PACKAGE_ + "Cache";
-		String CACHE__SHARED = "shared";
-		String CACHE__EXPIRY = "expiry";
-		String CACHE__EXPIRY_TIME_OF_DAY = "expiryTimeOfDay";
-		String CACHE__TYPE = "type";
-		String CACHE__SIZE = "size";
-		String CACHE__ALWAYS_REFRESH = "alwaysRefresh";
-		String CACHE__REFRESH_ONLY_IF_NEWER = "refreshOnlyIfNewer";
-		String CACHE__DISABLE_HITS = "disableHits";
-		String CACHE__COORDINATION_TYPE = "coordinationType";
-	String CHANGE_TRACKING = PACKAGE_ + "ChangeTracking";
-		String CHANGE_TRACKING__VALUE = "value";
-	String CONVERSION_VALUE = PACKAGE_ + "ConversionValue";
-		String CONVERSION_VALUE__DATA_VALUE = "dataValue";
-		String CONVERSION_VALUE__OBJECT_VALUE = "objectValue";
-	String CONVERT = PACKAGE_ + "Convert";
-		String CONVERT__VALUE = "value";
-	String CONVERTER = PACKAGE_ + "Converter";
-		String CONVERTER__NAME = "name";
-		String CONVERTER__CONVERTER_CLASS = "converterClass";
-	String CUSTOMIZER = PACKAGE_ + "Customizer";
-		String CUSTOMIZER__VALUE = "value";
-	String EXISTENCE_CHECKING = PACKAGE_ + "ExistenceChecking";
-		String EXISTENCE_CHECKING__VALUE = "value";
-	String JOIN_FETCH = PACKAGE_ + "JoinFetch";
-		String JOIN_FETCH__VALUE = "value";
-	String MUTABLE = PACKAGE_ + "Mutable";
-		String MUTABLE__VALUE = "value";
-	String OBJECT_TYPE_CONVERTER = PACKAGE_ + "ObjectTypeConverter";
-		String OBJECT_TYPE_CONVERTER__NAME = "name";
-		String OBJECT_TYPE_CONVERTER__DATA_TYPE = "dataType";
-		String OBJECT_TYPE_CONVERTER__OBJECT_TYPE = "objectType";
-		String OBJECT_TYPE_CONVERTER__CONVERSION_VALUES = "conversionValues";
-		String OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE = "defaultObjectValue";
-	String PRIMARY_KEY = PACKAGE_ + "PrimaryKey";
-		String PRIMARY_KEY__VALIDATION = "validation";
-		String PRIMARY_KEY__CACHE_KEY_TYPE = "cacheKeyType";
-		String PRIMARY_KEY__COLUMNS = "columns";
-	String PRIVATE_OWNED = PACKAGE_ + "PrivateOwned";
-	String READ_ONLY = PACKAGE_ + "ReadOnly";
-	String READ_TRANSFORMER = PACKAGE_ + "ReadTransformer";
-		String READ_TRANSFORMER__TRANSFORMER_CLASS = "transformerClass";
-		String READ_TRANSFORMER__METHOD = "method";
-	String STRUCT_CONVERTER = PACKAGE_ + "StructConverter";
-		String STRUCT_CONVERTER__NAME = "name";
-		String STRUCT_CONVERTER__CONVERTER = "converter";
-	String TIME_OF_DAY = PACKAGE_ + "TimeOfDay";
-		String TIME_OF_DAY__HOUR = "hour";
-		String TIME_OF_DAY__MINUTE = "minute";
-		String TIME_OF_DAY__SECOND = "second";
-		String TIME_OF_DAY__MILLISECOND = "millisecond";
-	String TRANSFORMATION = PACKAGE_ + "Transformation";
-		String TRANSFORMATION__FETCH = "fetch";
-		String TRANSFORMATION__OPTIONAL = "optional";
-	String TYPE_CONVERTER = PACKAGE_ + "TypeConverter";
-		String TYPE_CONVERTER__NAME = "name";
-		String TYPE_CONVERTER__DATA_TYPE = "dataType";
-		String TYPE_CONVERTER__OBJECT_TYPE = "objectType";
-	String VARIABLE_ONE_TO_ONE = PACKAGE_ + "VariableOneToOne";
-	String WRITE_TRANSFORMER = PACKAGE_ + "WriteTransformer";
-		String WRITE_TRANSFORMER__TRANSFORMER_CLASS = "transformerClass";
-		String WRITE_TRANSFORMER__METHOD = "method";
-		String WRITE_TRANSFORMER__COLUMN = "column";
-	String WRITE_TRANSFORMERS = PACKAGE_ + "WriteTransformers";
-		String WRITE_TRANSFORMERS__VALUE = "value";
-
-	// EclipseLink enums
-	String CACHE_COORDINATION_TYPE = PACKAGE_ + "CacheCoordinationType";
-		String CACHE_COORDINATION_TYPE_ = CACHE_COORDINATION_TYPE + ".";
-		String CACHE_COORDINATION_TYPE__SEND_OBJECT_CHANGES = CACHE_COORDINATION_TYPE_ + "SEND_OBJECT_CHANGES";
-		String CACHE_COORDINATION_TYPE__INVALIDATE_CHANGED_OBJECTS = CACHE_COORDINATION_TYPE_ + "INVALIDATE_CHANGED_OBJECTS";
-		String CACHE_COORDINATION_TYPE__SEND_NEW_OBJECTS_WITH_CHANGES = CACHE_COORDINATION_TYPE_ + "SEND_NEW_OBJECTS_WITH_CHANGES";
-		String CACHE_COORDINATION_TYPE__NONE = CACHE_COORDINATION_TYPE_ + "NONE";
-	String CACHE_TYPE = PACKAGE_ + "CacheType";
-		String CACHE_TYPE_ = CACHE_TYPE + ".";
-		String CACHE_TYPE__FULL = CACHE_TYPE_ + "FULL";
-		String CACHE_TYPE__WEAK = CACHE_TYPE_ + "WEAK";
-		String CACHE_TYPE__SOFT = CACHE_TYPE_ + "SOFT";
-		String CACHE_TYPE__SOFT_WEAK = CACHE_TYPE_ + "SOFT_WEAK";
-		String CACHE_TYPE__HARD_WEAK = CACHE_TYPE_ + "HARD_WEAK";
-		String CACHE_TYPE__CACHE = CACHE_TYPE_ + "CACHE";
-		String CACHE_TYPE__NONE = CACHE_TYPE_ + "NONE";
-	String CHANGE_TRACKING_TYPE = PACKAGE_ + "ChangeTrackingType";
-		String CHANGE_TRACKING_TYPE_ = CHANGE_TRACKING_TYPE + ".";
-		String CHANGE_TRACKING_TYPE__ATTRIBUTE = CHANGE_TRACKING_TYPE_ + "ATTRIBUTE";
-		String CHANGE_TRACKING_TYPE__OBJECT = CHANGE_TRACKING_TYPE_ + "OBJECT";
-		String CHANGE_TRACKING_TYPE__DEFERRED = CHANGE_TRACKING_TYPE_ + "DEFERRED";
-		String CHANGE_TRACKING_TYPE__AUTO = CHANGE_TRACKING_TYPE_ + "AUTO";
-	String EXISTENCE_TYPE = PACKAGE_ + "ExistenceType";
-		String EXISTENCE_TYPE_ = EXISTENCE_TYPE + ".";
-		String EXISTENCE_TYPE__CHECK_CACHE = EXISTENCE_TYPE_ + "CHECK_CACHE";
-		String EXISTENCE_TYPE__CHECK_DATABASE = EXISTENCE_TYPE_ + "CHECK_DATABASE";
-		String EXISTENCE_TYPE__ASSUME_EXISTENCE = EXISTENCE_TYPE_ + "ASSUME_EXISTENCE";
-		String EXISTENCE_TYPE__ASSUME_NON_EXISTENCE = EXISTENCE_TYPE_ + "ASSUME_NON_EXISTENCE";
-	String JOIN_FETCH_TYPE = PACKAGE_ + "JoinFetchType";
-		String JOIN_FETCH_TYPE_ = JOIN_FETCH_TYPE + ".";
-		String JOIN_FETCH_TYPE__INNER = JOIN_FETCH_TYPE_ + "INNER";
-		String JOIN_FETCH_TYPE__OUTER = JOIN_FETCH_TYPE_ + "OUTER";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkBasicCollectionAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkBasicCollectionAnnotation.java
deleted file mode 100644
index ee73c4fa67..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkBasicCollectionAnnotation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.BasicCollection
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkBasicCollectionAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.BASIC_COLLECTION;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkBasicMapAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkBasicMapAnnotation.java
deleted file mode 100644
index 9a12bd45b7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkBasicMapAnnotation.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-
-
-/**
- * Corresponds to the Eclipselink annotation
- * org.eclipse.persistence.annotations.BasicMap
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkBasicMapAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.BASIC_MAP;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCacheAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCacheAnnotation.java
deleted file mode 100644
index cacb1a10a6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCacheAnnotation.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.Cache
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkCacheAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.CACHE;
-
-	/**
-	 * Corresponds to the 'type' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	CacheType getType();
-		String TYPE_PROPERTY = "type"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'type' element of the Cache annotation.
-	 * Set to null to remove the element.
-	 */
-	void setType(CacheType type);
-
-	/**
-	 * Return the {@link TextRange} for the 'type' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getTypeTextRange(CompilationUnit astRoot);
-	
-
-	/**
-	 * Corresponds to the 'size' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Integer getSize();
-		String SIZE_PROPERTY = "size"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'size' element of the Cache annotation.
-	 * Set to null to remove the element.
-	 */
-	void setSize(Integer size);
-		
-	/**
-	 * Return the {@link TextRange} for the 'size' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getSizeTextRange(CompilationUnit astRoot);
-	
-
-	/**
-	 * Corresponds to the 'shared' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Boolean getShared();
-		String SHARED_PROPERTY = "shared"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'shared' element of the Cache annotation.
-	 * Set to null to remove the element.
-	 */
-	void setShared(Boolean shared);
-
-	/**
-	 * Return the {@link TextRange} for the 'shared' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getSharedTextRange(CompilationUnit astRoot);
-
-
-	/**
-	 * Corresponds to the 'expiry' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Integer getExpiry();
-		String EXPIRY_PROPERTY = "expiry"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'expiry' element of the Cache annotation.
-	 * Set to null to remove the element.
-	 */
-	void setExpiry(Integer expiry);
-
-	/**
-	 * Return the {@link TextRange} for the 'expiry' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getExpiryTextRange(CompilationUnit astRoot);
-	
-
-	/**
-	 * Corresponds to the 'expiryTimeOfDay' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	EclipseLinkTimeOfDayAnnotation getExpiryTimeOfDay();
-		String EXPIRY_TIME_OF_DAY_PROPERTY = "expiryTimeOfDay"; //$NON-NLS-1$
-
-	EclipseLinkTimeOfDayAnnotation addExpiryTimeOfDay();
-
-	void removeExpiryTimeOfDay();
-		
-	/**
-	 * Return the {@link TextRange} for the 'expiryTimeOfDay' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getExpiryTimeOfDayTextRange(CompilationUnit astRoot);
-	
-
-	/**
-	 * Corresponds to the 'alwaysRefresh' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Boolean getAlwaysRefresh();
-		String ALWAYS_REFRESH_PROPERTY = "alwaysRefresh"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'alwaysRefresh' element of the Cache annotation.
-	 * Set to null to remove the element.
-	 */
-	void setAlwaysRefresh(Boolean alwaysRefresh);
-		
-	/**
-	 * Return the {@link TextRange} for the 'alwaysRefresh' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getAlwaysRefreshTextRange(CompilationUnit astRoot);
-	
-
-	/**
-	 * Corresponds to the 'refreshOnlyIfNewer' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Boolean getRefreshOnlyIfNewer();
-		String REFRESH_ONLY_IF_NEWER_PROPERTY = "refreshOnlyIfNewer"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'refreshOnlyIfNewer' element of the Cache annotation.
-	 * Set to null to remove the element.
-	 */
-	void setRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer);
-		
-	/**
-	 * Return the {@link TextRange} for the 'refreshOnlyIfNewer' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getRefreshOnlyIfNewerTextRange(CompilationUnit astRoot);
-	
-
-	/**
-	 * Corresponds to the 'disableHits' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Boolean getDisableHits();
-		String DISABLE_HITS_PROPERTY = "disableHits"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'disableHits' element of the Cache annotation.
-	 * Set to null to remove the element.
-	 */
-	void setDisableHits(Boolean disableHits);
-		
-	/**
-	 * Return the {@link TextRange} for the 'disableHits' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getDisablesHitsTextRange(CompilationUnit astRoot);
-	
-
-	/**
-	 * Corresponds to the 'coordinationType' element of the Cache annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	CacheCoordinationType getCoordinationType();
-		String COORDINATION_TYPE_PROPERTY = "coordinationType"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'coordinationType' element of the Cache annotation.
-	 * Set to null to remove the element.
-	 */
-	void setCoordinationType(CacheCoordinationType coordinationType);
-
-	/**
-	 * Return the {@link TextRange} for the 'coordinationType' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Cache annotation.
-	 */
-	TextRange getCoordinationTypeTextRange(CompilationUnit astRoot);
-	
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkChangeTrackingAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkChangeTrackingAnnotation.java
deleted file mode 100644
index d4a7722b0c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkChangeTrackingAnnotation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.ChangeTracking
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkChangeTrackingAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.CHANGE_TRACKING;
-
-	/**
-	 * Corresponds to the 'value' element of the ChangeTracking annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	ChangeTrackingType getValue();
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'value' element of the ChangeTracking annotation.
-	 * Set to null to remove the element.
-	 */
-	void setValue(ChangeTrackingType value);
-
-	/**
-	 * Return the {@link TextRange} for the 'value' element.  If the element 
-	 * does not exist return the {@link TextRange} for the ChangeTracking annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConversionValueAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConversionValueAnnotation.java
deleted file mode 100644
index adbc1d35a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConversionValueAnnotation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.ConversionValue
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkConversionValueAnnotation
-	extends NestableAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink.CONVERSION_VALUE;
-
-	/**
-	 * Corresponds to the 'dataValue' element of the ConversionValue annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getDataValue();
-		String DATA_VALUE_PROPERTY = "dataValue"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'dataValue' element of the ConversionValue annotation.
-	 * Set to null to remove the element.
-	 */
-	void setDataValue(String dataValue);
-
-	/**
-	 * Return the {@link TextRange} for the 'dataValue' element. If the element 
-	 * does not exist return the {@link TextRange} for the ConversionValue annotation.
-	 */
-	TextRange getDataValueTextRange(CompilationUnit astRoot);
-
-
-	/**
-	 * Corresponds to the 'objectValue' element of the ConversionValue annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getObjectValue();
-		String OBJECT_VALUE_PROPERTY = "objectValue"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'objectValue' element of the ConversionValue annotation.
-	 * Set to null to remove the element.
-	 */
-	void setObjectValue(String objectValue);
-
-	/**
-	 * Return the {@link TextRange} for the 'objectValue' element. If the element 
-	 * does not exist return the {@link TextRange} for the ConversionValue annotation.
-	 */
-	TextRange getObjectValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConvertAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConvertAnnotation.java
deleted file mode 100644
index bf89b181a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConvertAnnotation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.Convert
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkConvertAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.CONVERT;
-		
-	/**
-	 * Corresponds to the 'value' element of the Convert annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getValue();
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'value' element of the Convert annotation.
-	 * Set to null to remove the element.
-	 */
-	void setValue(String value);
-	
-	/**
-	 * Return the {@link TextRange} for the 'value' element. If the element 
-	 * does not exist return the {@link TextRange} for the Convert annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified position touches the 'value' element.
-	 * Return false if the element does not exist.
-	 */
-	boolean valueTouches(int pos, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java
deleted file mode 100644
index 4541271964..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.Converter
- * 
- * 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.
- * 
- * @version 2.3
- * @since 2.1
- */
-public interface EclipseLinkConverterAnnotation
-	extends EclipseLinkNamedConverterAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink.CONVERTER;
-		
-	/**
-	 * Corresponds to the 'converterClass' element of the Converter annotation.
-	 * Returns null if the element does not exist in java.
-	 */
-	String getConverterClass();
-		String CONVERTER_CLASS_PROPERTY = "converterClass"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'converterClass' element of the Converter annotation.
-	 * Set to null to remove the element.
-	 */
-	void setConverterClass(String value);
-
-	/**
-	 * Return the fully-qualified converter class name as resolved by the
-	 * AST's bindings.
-	 * <pre>
-	 *     &#64;Converter(GenderConverter.class)
-	 * </pre>
-	 * will return <code>"model.GenderConverter"</code> if there is an import for
-	 * <code>model.GenderConverter</code>.
-	 */
-	String getFullyQualifiedConverterClassName();
-		
-	/**
-	 * Return the {@link TextRange} for the 'converterClass' element. If the element 
-	 * does not exist return the {@link TextRange} for the Converter annotation.
-	 */
-	TextRange getConverterClassTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the converter class implements the specified interface.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter#ECLIPSELINK_CONVERTER_CLASS_NAME
-	 */
-	boolean converterClassImplementsInterface(String interfaceName, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java
deleted file mode 100644
index 9005f36be0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.Customizer
- * 
- * 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.
- * 
- * @version 2.3
- * @since 2.1
- */
-public interface EclipseLinkCustomizerAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.CUSTOMIZER;
-
-	/**
-	 * Corresponds to the 'value' element of the Customizer annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getValue();
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'value' element of the Customizer annotation.
-	 * Set to null to remove the element.
-	 */
-	void setValue(String value);
-
-	/**
-	 * Return the fully-qualified customizer class name as resolved by the
-	 * AST's bindings.
-	 * <pre>
-	 *     &#64;Customizer(EmployeeCustomizer.class)
-	 * </pre>
-	 * will return <code>"model.EmployeeCustomizer"</code> if there is an
-	 * import for <code>model.EmployeeCustomizer</code>.
-	 */
-	String getFullyQualifiedCustomizerClassName();
-
-	/**
-	 * Return the {@link TextRange} for the 'value' element. If the element 
-	 * does not exist return the {@link TextRange} for the Customizer annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the customizer class implements the specified interface.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomizer#ECLIPSELINK_DESCRIPTOR_CUSTOMIZER_CLASS_NAME
-	 */
-	boolean customizerClassImplementsInterface(String interfaceName, CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkExistenceCheckingAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkExistenceCheckingAnnotation.java
deleted file mode 100644
index ec83a0d272..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkExistenceCheckingAnnotation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.ExistenceChecking
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkExistenceCheckingAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.EXISTENCE_CHECKING;
-
-	/**
-	 * Corresponds to the 'value' element of the ExistenceChecking annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	ExistenceType getValue();
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'value' element of the ExistenceChecking annotation.
-	 * Set to null to remove the element.
-	 */
-	void setValue(ExistenceType value);
-
-	/**
-	 * Return the {@link TextRange} for the 'value' element. If the element 
-	 * does not exist return the {@link TextRange} for the ExistenceChecking annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkJoinFetchAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkJoinFetchAnnotation.java
deleted file mode 100644
index 4c5d89caee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkJoinFetchAnnotation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.JoinFetch
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkJoinFetchAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.JOIN_FETCH;
-
-	/**
-	 * Corresponds to the 'value' element of the JoinFetch annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	JoinFetchType getValue();
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'value' element of the JoinFetch annotation.
-	 * Set to null to remove the element.
-	 */
-	void setValue(JoinFetchType value);
-
-	/**
-	 * Return the {@link TextRange} for the 'value' element. If the element 
-	 * does not exist return the {@link TextRange} for the JoinFetch annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkMutableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkMutableAnnotation.java
deleted file mode 100644
index 2e9d6701a5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkMutableAnnotation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the Eclipselink annotation
- * org.eclipse.persistence.annotations.Mutable
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkMutableAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.MUTABLE;
-		
-	/**
-	 * Corresponds to the 'value' element of the Mutable annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Boolean getValue();
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'value' element of the Mutable annotation.
-	 * Set to null to remove the element.
-	 */
-	void setValue(Boolean value);
-	
-	/**
-	 * Return the {@link TextRange} for the 'value' element. If the element 
-	 * does not exist return the {@link TextRange} for the Mutable annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkNamedConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkNamedConverterAnnotation.java
deleted file mode 100644
index bd829120c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkNamedConverterAnnotation.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Common protocol among:
- *     org.eclipse.persistence.annotations.Converter
- *     org.eclipse.persistence.annotations.StructConverter
- *     org.eclipse.persistence.annotations.TypeConverter
- *     org.eclipse.persistence.annotations.ObjectTypeConverter
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkNamedConverterAnnotation
-	extends Annotation
-{
-	/**
-	 * Corresponds to the 'name' element of the *Converter annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getName();
-		String NAME_PROPERTY = "name"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'name' element of the *Converter annotation.
-	 * Set to null to remove the element.
-	 */
-	void setName(String value);
-
-	/**
-	 * Return the {@link TextRange} for the 'name' element. If the element 
-	 * does not exist return the {@link TextRange} for the CustomConverter annotation.
-	 */
-	TextRange getNameTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkObjectTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkObjectTypeConverterAnnotation.java
deleted file mode 100644
index f9e73a5ca1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkObjectTypeConverterAnnotation.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.ObjectTypeConverter
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkObjectTypeConverterAnnotation
-	extends BaseEclipseLinkTypeConverterAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink.OBJECT_TYPE_CONVERTER;
-	
-	/**
-	 * Corresponds to the 'conversionValues' element of the ObjectTypeConverter annotation.
-	 * Return an empty iterator if the element does not exist in Java.
-	 */
-	ListIterable<EclipseLinkConversionValueAnnotation> getConversionValues();
-		String CONVERSION_VALUES_LIST = "conversionValues"; //$NON-NLS-1$
-	
-	/**
-	 * Corresponds to the 'conversionValues' element of the ObjectTypeConverter annotation.
-	 */
-	int getConversionValuesSize();
-	
-	/**
-	 * Corresponds to the 'conversionValues' element of the ObjectTypeConverter annotation.
-	 */
-	EclipseLinkConversionValueAnnotation conversionValueAt(int index);
-	
-	/**
-	 * Corresponds to the 'conversionValues' element of the ObjectTypeConverter annotation.
-	 */
-	EclipseLinkConversionValueAnnotation addConversionValue(int index);
-	
-	/**
-	 * Corresponds to the 'conversionValues' element of the ObjectTypeConverter annotation.
-	 */
-	void moveConversionValue(int targetIndex, int sourceIndex);
-	
-	/**
-	 * Corresponds to the 'conversionValues' element of the ObjectTypeConverter annotation.
-	 */
-	void removeConversionValue(int index);
-	
-
-	/**
-	 * Corresponds to the 'defaultObjectValue' element of the ObjectTypeConverter annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getDefaultObjectValue();
-		String DEFAULT_OBJECT_VALUE_PROPERTY = "defaultObjectValue"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'defaultObjectValue' element of the ObjectTypeConverter annotation.
-	 * Set to null to remove the element.
-	 */
-	void setDefaultObjectValue(String value);
-
-	/**
-	 * Return the {@link TextRange} for the 'defaultObjectValue' element. If the element 
-	 * does not exist return the {@link TextRange} for the ObjectTypeConverter annotation.
-	 */
-	TextRange getDefaultObjectValueTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkPrimaryKeyAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkPrimaryKeyAnnotation.java
deleted file mode 100644
index 11a0731a06..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkPrimaryKeyAnnotation.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.PrimaryKey
- * 
- * 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.
- * 
- * @version 2.3
- * @since 2.3
- */
-public interface EclipseLinkPrimaryKeyAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.PRIMARY_KEY;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkPrivateOwnedAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkPrivateOwnedAnnotation.java
deleted file mode 100644
index ab96344b6b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkPrivateOwnedAnnotation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.PrivateOwned
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkPrivateOwnedAnnotation
-	extends Annotation
-{	
-	String ANNOTATION_NAME = EclipseLink.PRIVATE_OWNED;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkReadOnlyAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkReadOnlyAnnotation.java
deleted file mode 100644
index a11da33e60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkReadOnlyAnnotation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.ReadOnly
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkReadOnlyAnnotation
-	extends Annotation
-{	
-	String ANNOTATION_NAME = EclipseLink.READ_ONLY;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkReadTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkReadTransformerAnnotation.java
deleted file mode 100644
index c87bd19870..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkReadTransformerAnnotation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.ReadTransformer
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkReadTransformerAnnotation
-	extends EclipseLinkTransformerAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink.READ_TRANSFORMER;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkStructConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkStructConverterAnnotation.java
deleted file mode 100644
index 03eb6bf40b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkStructConverterAnnotation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.StructConverter
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkStructConverterAnnotation
-	extends EclipseLinkNamedConverterAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink.STRUCT_CONVERTER;
-
-	/**
-	 * Corresponds to the 'converter' element of the StructConverter annotation.
-	 * Returns null if the element does not exist in Java.
-	 */
-	String getConverter();
-		String CONVERTER_PROPERTY = "converter"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'converter' element of the StructConverter annotation.
-	 * Set to null to remove the element.
-	 */
-	void setConverter(String converter);
-
-	/**
-	 * Return the {@link TextRange} for the 'converter' element. If the element 
-	 * does not exist return the {@link TextRange} for the StructConverter annotation.
-	 */
-	TextRange getConverterTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTimeOfDayAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTimeOfDayAnnotation.java
deleted file mode 100644
index 456178cf5a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTimeOfDayAnnotation.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * <code>org.eclipse.persistence.annotations.TimeOfDay</code>
- * <p>
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkTimeOfDayAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.TIME_OF_DAY;
-
-
-	// ********** hour **********
-
-	/**
-	 * Corresponds to the 'hour' element of the TimeOfDay annotation.
-	 * Return null if the element does not exist in the annotation.
-	 */
-	Integer getHour();
-		String HOUR_PROPERTY = "hour"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'hour' element of the TimeOfDay annotation.
-	 * Set to null to remove the element from the annotation
-	 */
-	void setHour(Integer hour);
-
-	/**
-	 * Return the {@link TextRange} for the 'hour' element. If the element 
-	 * does not exist return the {@link TextRange} for the TimeOfDay annotation.
-	 */
-	TextRange getHourTextRange(CompilationUnit astRoot);
-
-
-	// ********** minute **********
-
-	/**
-	 * Corresponds to the 'minute' element of the TimeOfDay annotation.
-	 * Return null if the element does not exist in the annotation.
-	 */
-	Integer getMinute();
-		String MINUTE_PROPERTY = "minute"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'minute' element of the TimeOfDay annotation.
-	 * Set to null to remove the element from the annotation
-	 */
-	void setMinute(Integer minute);
-
-	/**
-	 * Return the {@link TextRange} for the 'minute' element. If the element 
-	 * does not exist return the {@link TextRange} for the TimeOfDay annotation.
-	 */
-	TextRange getMinuteTextRange(CompilationUnit astRoot);
-
-
-	// ********** second **********
-
-	/**
-	 * Corresponds to the 'second' element of the TimeOfDay annotation.
-	 * Return null if the element does not exist in the annotation.
-	 */
-	Integer getSecond();
-		String SECOND_PROPERTY = "second"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'second' element of the TimeOfDay annotation.
-	 * Set to null to remove the element from the annotation
-	 */
-	void setSecond(Integer second);
-
-	/**
-	 * Return the {@link TextRange} for the 'second' element. If the element 
-	 * does not exist return the {@link TextRange} for the TimeOfDay annotation.
-	 */
-	TextRange getSecondTextRange(CompilationUnit astRoot);
-
-
-	// ********** millisecond **********
-
-	/**
-	 * Corresponds to the 'millisecond' element of the TimeOfDay annotation.
-	 * Return null if the element does not exist in the annotation.
-	 */
-	Integer getMillisecond();
-		String MILLISECOND_PROPERTY = "millisecond"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'millisecond' element of the TimeOfDay annotation.
-	 * Set to null to remove the element from the annotation
-	 */
-	void setMillisecond(Integer millisecond);
-
-	/**
-	 * Return the {@link TextRange} for the 'millisecond' element. If the element 
-	 * does not exist return the {@link TextRange} for the TimeOfDay annotation.
-	 */
-	TextRange getMillisecondTextRange(CompilationUnit astRoot);
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTransformationAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTransformationAnnotation.java
deleted file mode 100644
index 8cb7363749..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTransformationAnnotation.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.java.FetchType;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.Transformation
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkTransformationAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.TRANSFORMATION;
-
-	/**
-	 * Corresponds to the 'fetch' element of the Transformation annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	FetchType getFetch();
-		String FETCH_PROPERTY = "fetch"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'fetch' element of the Transformation annotation.
-	 * Set to null to remove the element.
-	 */
-	void setFetch(FetchType fetch);
-
-	/**
-	 * Return the {@link TextRange} for the 'fetch' element. If the element 
-	 * does not exist return the {@link TextRange} for the Transformation annotation.
-	 */
-	TextRange getFetchTextRange(CompilationUnit astRoot);
-
-
-	/**
-	 * Corresponds to the 'optional' element of the Transformation annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Boolean getOptional();
-		String OPTIONAL_PROPERTY = "optional"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'optional' element of the Transformation annotation.
-	 * Set to null to remove the element.
-	 */
-	void setOptional(Boolean optional);
-
-	/**
-	 * Return the {@link TextRange} for the 'optional' element. If the element 
-	 * does not exist return the {@link TextRange} for the Transformation annotation.
-	 */
-	TextRange getOptionalTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTransformerAnnotation.java
deleted file mode 100644
index 576a50c3db..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTransformerAnnotation.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Common protocol among:
- *     org.eclipse.persistence.annotations.ReadTransformer
- *     org.eclipse.persistence.annotations.WriteTransformer
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkTransformerAnnotation
-	extends Annotation
-{
-	/**
-	 * Corresponds to the 'transformerClass' element of the *Transformer annotation.
-	 * Return null if the element does not exist in Java.
-	 * Return the portion of the value preceding ".class".
-	 * <pre>
-	 *     &#64;ReadTransformer(transformerClass=Employee.class)
-	 * </pre>
-	 * will return "Employee".
-	 */
-	String getTransformerClass();
-		String TRANSFORMER_CLASS_PROPERTY = "transformerClass"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'transformerClass' element of the *Transformer annotation.
-	 * Set to null to remove the element.
-	 */
-	void setTransformerClass(String transformerClass);
-
-	/**
-	 * Return the {@link TextRange} for the 'transformerClass' element. If the element 
-	 * does not exist return the {@link TextRange} for the *Transformer annotation.
-	 */
-	TextRange getTransformerClassTextRange(CompilationUnit astRoot);
-
-
-	/**
-	 * Corresponds to the 'method' element of the *Transformer annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getMethod();
-		String METHOD_PROPERTY = "method"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'method' element of the *Transformer annotation.
-	 * Set to null to remove the element.
-	 */
-	void setMethod(String method);
-
-	/**
-	 * Return the {@link TextRange} for the 'method' element. If the element 
-	 * does not exist return the {@link TextRange} for the *Transformer annotation.
-	 */
-	TextRange getMethodTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTypeConverterAnnotation.java
deleted file mode 100644
index 0730284239..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkTypeConverterAnnotation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.TypeConverter
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkTypeConverterAnnotation
-	extends BaseEclipseLinkTypeConverterAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink.TYPE_CONVERTER;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkVariableOneToOneAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkVariableOneToOneAnnotation.java
deleted file mode 100644
index 91e3f4fd2a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkVariableOneToOneAnnotation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-
-/**
- * Corresponds to EclipseLink annotation
- * org.eclipse.persistence.annotations.VariableOneToOne
- * 
- * 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.
- * 
- * @version 2.2
- * @since 2.2
- */
-public interface EclipseLinkVariableOneToOneAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink.VARIABLE_ONE_TO_ONE;
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkWriteTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkWriteTransformerAnnotation.java
deleted file mode 100644
index 8d6a3452bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/EclipseLinkWriteTransformerAnnotation.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
-
-/**
- * Corresponds to the Eclipselink annotation
- * org.eclipse.persistence.annotations.WriteTransformer
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public interface EclipseLinkWriteTransformerAnnotation
-	extends EclipseLinkTransformerAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink.WRITE_TRANSFORMER;
-
-	/**
-	 * Corresponds to the 'column' element of the WriteTransformer annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	ColumnAnnotation getColumn();
-		String COLUMN_PROPERTY = "column"; //$NON-NLS-1$
-
-	/**
-	 * Return a ColumnAnnotation, but do not return null if the 'column'
-	 * element does not exist on the WriteTransformer annotation. Instead
-	 * return a null object.
-	 */
-	ColumnAnnotation getNonNullColumn();
-
-	/**
-	 * Add the 'column' element to the WriteTransformer annotation.
-	 */
-	ColumnAnnotation addColumn();
-
-	/**
-	 * Remove the 'column' element from the WriteTransformer annotation.
-	 */
-	void removeColumn();
-
-	/**
-	 * Return the {@link TextRange} for the 'column' element. If the element 
-	 * does not exist return the {@link TextRange} for the WriteTransformer annotation.
-	 */
-	TextRange getColumnTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/ExistenceType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/ExistenceType.java
deleted file mode 100644
index 52782728a1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/ExistenceType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-/**
- * Corresponds to the EclipseLink enum
- * org.eclipse.persistence.annotations.ExistenceType
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum ExistenceType {
-
-    CHECK_CACHE(EclipseLink.EXISTENCE_TYPE__CHECK_CACHE),
-    CHECK_DATABASE(EclipseLink.EXISTENCE_TYPE__CHECK_DATABASE),
-    ASSUME_EXISTENCE(EclipseLink.EXISTENCE_TYPE__ASSUME_EXISTENCE),
-    ASSUME_NON_EXISTENCE(EclipseLink.EXISTENCE_TYPE__ASSUME_NON_EXISTENCE);
-
-
-	private String javaAnnotationValue;
-
-	ExistenceType(String javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			throw new NullPointerException();
-		}
-		this.javaAnnotationValue = javaAnnotationValue;
-	}
-
-	public String getJavaAnnotationValue() {
-		return this.javaAnnotationValue;
-	}
-
-
-	// ********** static methods **********
-
-	public static ExistenceType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue);
-	}
-
-	private static ExistenceType fromJavaAnnotationValue_(Object javaAnnotationValue) {
-		for (ExistenceType existenceType : ExistenceType.values()) {
-			if (existenceType.getJavaAnnotationValue().equals(javaAnnotationValue)) {
-				return existenceType;
-			}
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(ExistenceType existenceType) {
-		return (existenceType == null) ? null : existenceType.getJavaAnnotationValue();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/JoinFetchType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/JoinFetchType.java
deleted file mode 100644
index 6ebf81d55c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/java/JoinFetchType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.java;
-
-/**
- * Corresponds to the EclipseLink enum
- * org.eclipse.persistence.annotations.JoinFetchType
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public enum JoinFetchType {
-
-    INNER(EclipseLink.JOIN_FETCH_TYPE__INNER),
-    OUTER(EclipseLink.JOIN_FETCH_TYPE__OUTER);
-
-
-	private String javaAnnotationValue;
-
-	JoinFetchType(String javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			throw new NullPointerException();
-		}
-		this.javaAnnotationValue = javaAnnotationValue;
-	}
-
-	public String getJavaAnnotationValue() {
-		return this.javaAnnotationValue;
-	}
-
-
-	// ********** static methods **********
-
-	public static JoinFetchType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue);
-	}
-
-	private static JoinFetchType fromJavaAnnotationValue_(Object javaAnnotationValue) {
-		for (JoinFetchType joinFetchType : JoinFetchType.values()) {
-			if (joinFetchType.getJavaAnnotationValue().equals(javaAnnotationValue)) {
-				return joinFetchType;
-			}
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(JoinFetchType joinFetchType) {
-		return (joinFetchType == null) ? null : joinFetchType.getJavaAnnotationValue();
-	}
-
-}
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
deleted file mode 100644
index 4b71f1aa60..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/Attributes.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-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.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;
-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.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attributes</b></em>'.
- *
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getBasicCollections <em>Basic Collections</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getBasicMaps <em>Basic Maps</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getTransformations <em>Transformations</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getVariableOneToOnes <em>Variable One To Ones</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes()
- * @model kind="class"
- * @generated
- */
-public class Attributes extends org.eclipse.jpt.jpa.core.resource.orm.Attributes implements XmlAttributes_2_3
-{
-	/**
-	 * The cached value of the '{@link #getStructures() <em>Structures</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructures()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlStructure_2_3> structures;
-
-	/**
-	 * The cached value of the '{@link #getArrays() <em>Arrays</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getArrays()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlArray_2_3> arrays;
-
-	/**
-	 * The cached value of the '{@link #getBasicCollections() <em>Basic Collections</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBasicCollections()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlBasicCollection> basicCollections;
-
-	/**
-	 * The cached value of the '{@link #getBasicMaps() <em>Basic Maps</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBasicMaps()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlBasicMap> basicMaps;
-
-	/**
-	 * The cached value of the '{@link #getTransformations() <em>Transformations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransformations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTransformation> transformations;
-
-	/**
-	 * The cached value of the '{@link #getVariableOneToOnes() <em>Variable One To Ones</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariableOneToOnes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlVariableOneToOne> variableOneToOnes;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Attributes()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.ATTRIBUTES;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Structures</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Structures</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>Structures</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAttributes_2_3_Structures()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlStructure_2_3> getStructures()
-	{
-		if (structures == null)
-		{
-			structures = new EObjectContainmentEList<XmlStructure_2_3>(XmlStructure_2_3.class, this, EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES);
-		}
-		return structures;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Arrays</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Arrays</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>Arrays</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAttributes_2_3_Arrays()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlArray_2_3> getArrays()
-	{
-		if (arrays == null)
-		{
-			arrays = new EObjectContainmentEList<XmlArray_2_3>(XmlArray_2_3.class, this, EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS);
-		}
-		return arrays;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Basic Collections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Basic Collections</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>Basic Collections</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes_BasicCollections()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlBasicCollection> getBasicCollections()
-	{
-		if (basicCollections == null)
-		{
-			basicCollections = new EObjectContainmentEList<XmlBasicCollection>(XmlBasicCollection.class, this, EclipseLinkOrmPackage.ATTRIBUTES__BASIC_COLLECTIONS);
-		}
-		return basicCollections;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Basic Maps</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Basic Maps</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>Basic Maps</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes_BasicMaps()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlBasicMap> getBasicMaps()
-	{
-		if (basicMaps == null)
-		{
-			basicMaps = new EObjectContainmentEList<XmlBasicMap>(XmlBasicMap.class, this, EclipseLinkOrmPackage.ATTRIBUTES__BASIC_MAPS);
-		}
-		return basicMaps;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Transformations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transformations</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>Transformations</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes_Transformations()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTransformation> getTransformations()
-	{
-		if (transformations == null)
-		{
-			transformations = new EObjectContainmentEList<XmlTransformation>(XmlTransformation.class, this, EclipseLinkOrmPackage.ATTRIBUTES__TRANSFORMATIONS);
-		}
-		return transformations;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Variable One To Ones</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Variable One To Ones</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>Variable One To Ones</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes_VariableOneToOnes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlVariableOneToOne> getVariableOneToOnes()
-	{
-		if (variableOneToOnes == null)
-		{
-			variableOneToOnes = new EObjectContainmentEList<XmlVariableOneToOne>(XmlVariableOneToOne.class, this, EclipseLinkOrmPackage.ATTRIBUTES__VARIABLE_ONE_TO_ONES);
-		}
-		return variableOneToOnes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES:
-				return ((InternalEList<?>)getStructures()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS:
-				return ((InternalEList<?>)getArrays()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_COLLECTIONS:
-				return ((InternalEList<?>)getBasicCollections()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_MAPS:
-				return ((InternalEList<?>)getBasicMaps()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.ATTRIBUTES__TRANSFORMATIONS:
-				return ((InternalEList<?>)getTransformations()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.ATTRIBUTES__VARIABLE_ONE_TO_ONES:
-				return ((InternalEList<?>)getVariableOneToOnes()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES:
-				return getStructures();
-			case EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS:
-				return getArrays();
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_COLLECTIONS:
-				return getBasicCollections();
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_MAPS:
-				return getBasicMaps();
-			case EclipseLinkOrmPackage.ATTRIBUTES__TRANSFORMATIONS:
-				return getTransformations();
-			case EclipseLinkOrmPackage.ATTRIBUTES__VARIABLE_ONE_TO_ONES:
-				return getVariableOneToOnes();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES:
-				getStructures().clear();
-				getStructures().addAll((Collection<? extends XmlStructure_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS:
-				getArrays().clear();
-				getArrays().addAll((Collection<? extends XmlArray_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_COLLECTIONS:
-				getBasicCollections().clear();
-				getBasicCollections().addAll((Collection<? extends XmlBasicCollection>)newValue);
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_MAPS:
-				getBasicMaps().clear();
-				getBasicMaps().addAll((Collection<? extends XmlBasicMap>)newValue);
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__TRANSFORMATIONS:
-				getTransformations().clear();
-				getTransformations().addAll((Collection<? extends XmlTransformation>)newValue);
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__VARIABLE_ONE_TO_ONES:
-				getVariableOneToOnes().clear();
-				getVariableOneToOnes().addAll((Collection<? extends XmlVariableOneToOne>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES:
-				getStructures().clear();
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS:
-				getArrays().clear();
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_COLLECTIONS:
-				getBasicCollections().clear();
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_MAPS:
-				getBasicMaps().clear();
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__TRANSFORMATIONS:
-				getTransformations().clear();
-				return;
-			case EclipseLinkOrmPackage.ATTRIBUTES__VARIABLE_ONE_TO_ONES:
-				getVariableOneToOnes().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES:
-				return structures != null && !structures.isEmpty();
-			case EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS:
-				return arrays != null && !arrays.isEmpty();
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_COLLECTIONS:
-				return basicCollections != null && !basicCollections.isEmpty();
-			case EclipseLinkOrmPackage.ATTRIBUTES__BASIC_MAPS:
-				return basicMaps != null && !basicMaps.isEmpty();
-			case EclipseLinkOrmPackage.ATTRIBUTES__TRANSFORMATIONS:
-				return transformations != null && !transformations.isEmpty();
-			case EclipseLinkOrmPackage.ATTRIBUTES__VARIABLE_ONE_TO_ONES:
-				return variableOneToOnes != null && !variableOneToOnes.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAttributes_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES: return EclipseLinkOrmV2_3Package.XML_ATTRIBUTES_23__STRUCTURES;
-				case EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS: return EclipseLinkOrmV2_3Package.XML_ATTRIBUTES_23__ARRAYS;
-				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 == XmlAttributes_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_3Package.XML_ATTRIBUTES_23__STRUCTURES: return EclipseLinkOrmPackage.ATTRIBUTES__STRUCTURES;
-				case EclipseLinkOrmV2_3Package.XML_ATTRIBUTES_23__ARRAYS: return EclipseLinkOrmPackage.ATTRIBUTES__ARRAYS;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	@Override
-	public List<XmlAttributeMapping> getAttributeMappings() {
-		// convert lists to arrays to avoid ConcurrentModificationException while adding to result list
-		ArrayList<XmlAttributeMapping> attributeMappings = new ArrayList<XmlAttributeMapping>();
-		CollectionTools.addAll(attributeMappings, this.getIds().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getEmbeddedIds().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getBasics().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getBasicCollections().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getBasicMaps().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getVersions().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getManyToOnes().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getOneToManys().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getOneToOnes().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getVariableOneToOnes().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getManyToManys().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getElementCollections().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getEmbeddeds().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getTransformations().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		CollectionTools.addAll(attributeMappings, this.getTransients().toArray(EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY));
-		return attributeMappings;
-	}
-
-	protected static final XmlAttributeMapping[] EMPTY_XML_ATTRIBUTE_MAPPING_ARRAY = new XmlAttributeMapping[0];
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getAttributes(), 
-			buildTranslatorChildren());
-	}
-	
-	public static Translator buildTranslator() {
-		return buildTranslator(
-			EclipseLink.ATTRIBUTES, 
-			OrmPackage.eINSTANCE.getXmlTypeMapping_Attributes());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			XmlId.buildTranslator(EclipseLink2_0.ID, OrmPackage.eINSTANCE.getAttributes_Ids()),
-			XmlEmbeddedId.buildTranslator(EclipseLink2_0.EMBEDDED_ID, OrmPackage.eINSTANCE.getAttributes_EmbeddedIds()),
-			XmlBasic.buildTranslator(EclipseLink2_0.BASIC, OrmPackage.eINSTANCE.getAttributes_Basics()),
-			XmlBasicCollection.buildTranslator(EclipseLink2_0.BASIC_COLLECTION, EclipseLinkOrmPackage.eINSTANCE.getAttributes_BasicCollections()),
-			XmlBasicMap.buildTranslator(EclipseLink2_0.BASIC_MAP, EclipseLinkOrmPackage.eINSTANCE.getAttributes_BasicMaps()),
-			XmlVersion.buildTranslator(EclipseLink2_0.VERSION, OrmPackage.eINSTANCE.getAttributes_Versions()),
-			XmlManyToOne.buildTranslator(EclipseLink2_0.MANY_TO_ONE, OrmPackage.eINSTANCE.getAttributes_ManyToOnes()),
-			XmlOneToMany.buildTranslator(EclipseLink2_0.ONE_TO_MANY, OrmPackage.eINSTANCE.getAttributes_OneToManys()),
-			XmlOneToOne.buildTranslator(EclipseLink2_0.ONE_TO_ONE, OrmPackage.eINSTANCE.getAttributes_OneToOnes()),
-			XmlVariableOneToOne.buildTranslator(EclipseLink2_0.VARIABLE_ONE_TO_ONE, EclipseLinkOrmPackage.eINSTANCE.getAttributes_VariableOneToOnes()),
-			XmlManyToMany.buildTranslator(EclipseLink2_0.MANY_TO_MANY, OrmPackage.eINSTANCE.getAttributes_ManyToManys()),
-			XmlElementCollection.buildTranslator(EclipseLink2_0.ELEMENT_COLLECTION, OrmV2_0Package.eINSTANCE.getXmlAttributes_2_0_ElementCollections()),
-			XmlEmbedded.buildTranslator(EclipseLink2_0.EMBEDDED, OrmPackage.eINSTANCE.getAttributes_Embeddeds()),
-			XmlTransformation.buildTranslator(EclipseLink2_0.TRANSFORMATION, EclipseLinkOrmPackage.eINSTANCE.getAttributes_Transformations()),
-			XmlTransient.buildTranslator(EclipseLink2_0.TRANSIENT, OrmPackage.eINSTANCE.getAttributes_Transients()),
-			XmlStructure.buildTranslator(EclipseLink2_3.STRUCTURE, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlAttributes_2_3_Structures()),
-			XmlArray.buildTranslator(EclipseLink2_3.ARRAY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlAttributes_2_3_Arrays()),
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/CacheCoordinationType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/CacheCoordinationType.java
deleted file mode 100644
index ce93ec06d2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/CacheCoordinationType.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the literals of the enumeration '<em><b>Cache Coordination Type</b></em>',
- * and utility methods for working with them.
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheCoordinationType()
- * @model
- * @generated
- */
-public enum CacheCoordinationType implements Enumerator
-{
-	/**
-	 * The '<em><b>SEND OBJECT CHANGES</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SEND_OBJECT_CHANGES_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SEND_OBJECT_CHANGES(0, "SEND_OBJECT_CHANGES", "SEND_OBJECT_CHANGES"),
-
-	/**
-	 * The '<em><b>INVALIDATE CHANGED OBJECTS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INVALIDATE_CHANGED_OBJECTS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INVALIDATE_CHANGED_OBJECTS(1, "INVALIDATE_CHANGED_OBJECTS", "INVALIDATE_CHANGED_OBJECTS"),
-
-	/**
-	 * The '<em><b>SEND NEW OBJECTS WITH CHANGES</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SEND_NEW_OBJECTS_WITH_CHANGES_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SEND_NEW_OBJECTS_WITH_CHANGES(2, "SEND_NEW_OBJECTS_WITH_CHANGES", "SEND_NEW_OBJECTS_WITH_CHANGES"),
-
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NONE(3, "NONE", "NONE");
-
-	/**
-	 * The '<em><b>SEND OBJECT CHANGES</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SEND OBJECT CHANGES</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SEND_OBJECT_CHANGES
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SEND_OBJECT_CHANGES_VALUE = 0;
-
-	/**
-	 * The '<em><b>INVALIDATE CHANGED OBJECTS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INVALIDATE CHANGED OBJECTS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INVALIDATE_CHANGED_OBJECTS
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INVALIDATE_CHANGED_OBJECTS_VALUE = 1;
-
-	/**
-	 * The '<em><b>SEND NEW OBJECTS WITH CHANGES</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SEND NEW OBJECTS WITH CHANGES</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SEND_NEW_OBJECTS_WITH_CHANGES
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SEND_NEW_OBJECTS_WITH_CHANGES_VALUE = 2;
-
-	/**
-	 * 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 = 3;
-
-	/**
-	 * An array of all the '<em><b>Cache Coordination Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final CacheCoordinationType[] VALUES_ARRAY =
-		new CacheCoordinationType[]
-		{
-			SEND_OBJECT_CHANGES,
-			INVALIDATE_CHANGED_OBJECTS,
-			SEND_NEW_OBJECTS_WITH_CHANGES,
-			NONE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Cache Coordination Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<CacheCoordinationType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Cache Coordination Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheCoordinationType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			CacheCoordinationType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cache Coordination Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheCoordinationType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			CacheCoordinationType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cache Coordination Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheCoordinationType get(int value)
-	{
-		switch (value)
-		{
-			case SEND_OBJECT_CHANGES_VALUE: return SEND_OBJECT_CHANGES;
-			case INVALIDATE_CHANGED_OBJECTS_VALUE: return INVALIDATE_CHANGED_OBJECTS;
-			case SEND_NEW_OBJECTS_WITH_CHANGES_VALUE: return SEND_NEW_OBJECTS_WITH_CHANGES;
-			case NONE_VALUE: return NONE;
-		}
-		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 CacheCoordinationType(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;
-	}
-	
-} //CacheCoordinationType
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/CacheType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/CacheType.java
deleted file mode 100644
index 2d35af2d10..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/CacheType.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheType()
- * @model
- * @generated
- */
-public enum CacheType implements Enumerator
-{
-	/**
-	 * The '<em><b>FULL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FULL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FULL(0, "FULL", "FULL"),
-
-	/**
-	 * The '<em><b>WEAK</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #WEAK_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	WEAK(1, "WEAK", "WEAK"),
-
-	/**
-	 * The '<em><b>SOFT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SOFT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SOFT(2, "SOFT", "SOFT"),
-
-	/**
-	 * The '<em><b>SOFT WEAK</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SOFT_WEAK_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SOFT_WEAK(3, "SOFT_WEAK", "SOFT_WEAK"),
-
-	/**
-	 * The '<em><b>HARD WEAK</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #HARD_WEAK_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	HARD_WEAK(4, "HARD_WEAK", "HARD_WEAK"),
-
-	/**
-	 * The '<em><b>CACHE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CACHE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CACHE(5, "CACHE", "CACHE"),
-
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NONE(6, "NONE", "NONE");
-
-	/**
-	 * The '<em><b>FULL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FULL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FULL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FULL_VALUE = 0;
-
-	/**
-	 * The '<em><b>WEAK</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>WEAK</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #WEAK
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int WEAK_VALUE = 1;
-
-	/**
-	 * The '<em><b>SOFT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SOFT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SOFT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SOFT_VALUE = 2;
-
-	/**
-	 * The '<em><b>SOFT WEAK</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SOFT WEAK</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SOFT_WEAK
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SOFT_WEAK_VALUE = 3;
-
-	/**
-	 * The '<em><b>HARD WEAK</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>HARD WEAK</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #HARD_WEAK
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int HARD_WEAK_VALUE = 4;
-
-	/**
-	 * The '<em><b>CACHE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CACHE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CACHE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CACHE_VALUE = 5;
-
-	/**
-	 * 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 = 6;
-
-	/**
-	 * An array of all the '<em><b>Cache Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final CacheType[] VALUES_ARRAY =
-		new CacheType[]
-		{
-			FULL,
-			WEAK,
-			SOFT,
-			SOFT_WEAK,
-			HARD_WEAK,
-			CACHE,
-			NONE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Cache Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<CacheType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Cache Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			CacheType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cache Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			CacheType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cache Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheType get(int value)
-	{
-		switch (value)
-		{
-			case FULL_VALUE: return FULL;
-			case WEAK_VALUE: return WEAK;
-			case SOFT_VALUE: return SOFT;
-			case SOFT_WEAK_VALUE: return SOFT_WEAK;
-			case HARD_WEAK_VALUE: return HARD_WEAK;
-			case CACHE_VALUE: return CACHE;
-			case NONE_VALUE: return NONE;
-		}
-		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 CacheType(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;
-	}
-	
-} //CacheType
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLink.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLink.java
deleted file mode 100644
index bec2cb9d24..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLink.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.jpa.core.resource.orm.JPA;
-
-@SuppressWarnings("nls")
-public interface EclipseLink
-	extends JPA
-{
-	String SCHEMA_NAMESPACE = "http://www.eclipse.org/eclipselink/xsds/persistence/orm";
-	String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_0.xsd";
-	String SCHEMA_VERSION = "1.0";
-	
-	// EclipseLink specific nodes
-	
-	String ACCESS_METHODS = "access-methods"; //$NON-NLS-1$
-	String ACCESS_METHODS__GET_METHOD = "get-method"; //$NON-NLS-1$
-	String ACCESS_METHODS__SET_METHOD = "set-method"; //$NON-NLS-1$
-	
-	String BASIC_COLLECTION = "basic-collection";  //$NON-NLS-1$
-	
-	String BASIC_MAP = "basic-map";  //$NON-NLS-1$
-	
-	String CACHE = "cache";  //$NON-NLS-1$
-	String CACHE__EXPIRY = "expiry";  //$NON-NLS-1$
-	String CACHE__SIZE = "size";  //$NON-NLS-1$
-	String CACHE__SHARED = "shared";  //$NON-NLS-1$
-	String CACHE__TYPE = "type";  //$NON-NLS-1$
-	String CACHE__ALWAYS_REFRESH = "always-refresh";  //$NON-NLS-1$
-	String CACHE__REFRESH_ONLY_IF_NEWER = "refresh-only-if-newer";  //$NON-NLS-1$
-	String CACHE__DISABLE_HITS = "disable-hits";  //$NON-NLS-1$
-	String CACHE__COORDINATION_TYPE = "coordination-type";  //$NON-NLS-1$
-	
-	String CHANGE_TRACKING = "change-tracking";  //$NON-NLS-1$
-		
-	String CONVERSION_VALUE = "conversion-value"; //$NON-NLS-1$
-	String CONVERSION_VALUE__DATA_VALUE = "data-value"; //$NON-NLS-1$
-	String CONVERSION_VALUE__OBJECT_VALUE = "object-value"; //$NON-NLS-1$
-
-	String CONVERT = "convert"; //$NON-NLS-1$
-	
-	String CONVERTER = "converter"; //$NON-NLS-1$
-	String CONVERTER__CLASS = "class"; //$NON-NLS-1$
-	String CONVERTER__NAME = "name"; //$NON-NLS-1$
-	
-	String COPY_POLICY = "copy-policy"; //$NON-NLS-1$
-		String COPY_POLICY__CLASS = "class"; //$NON-NLS-1$
-	
-	String CLONE_COPY_POLICY = "clone-copy-policy"; //$NON-NLS-1$
-		String CLONE_COPY_POLICY__METHOD = "method"; //$NON-NLS-1$
-		String CLONE_COPY_POLICY__WORKING_COPY_METHOD = "working-copy-method"; //$NON-NLS-1$
-	
-	String CUSTOMIZER = "customizer";  //$NON-NLS-1$
-
-	String EXCLUDE_DEFAULT_MAPPINGS = "exclude-default-mappings";  //$NON-NLS-1$
-
-	String EXISTENCE_CHECKING = "existence-checking";  //$NON-NLS-1$
-	
-	String EXPIRY_TIME_OF_DAY = "expiry-time-of-day";  //$NON-NLS-1$
-	String EXPIRY_TIME_OF_DAY__HOUR = "hour";  //$NON-NLS-1$
-	String EXPIRY_TIME_OF_DAY__MINUTE = "minute";  //$NON-NLS-1$
-	String EXPIRY_TIME_OF_DAY__SECOND = "second";  //$NON-NLS-1$
-	String EXPIRY_TIME_OF_DAY__MILLISECOND = "millisecond";  //$NON-NLS-1$
-	
-	String INSTANTIATION_COPY_POLICY = "instantiation-copy-policy"; //$NON-NLS-1$
-
-	String JOIN_FETCH = "join-fetch";  //$NON-NLS-1$
-	
-	String MUTABLE = "mutable";  //$NON-NLS-1$
-	
-	String NAMED_STORED_PROCEDURE_QUERY = "named-stored-procedure-query"; //$NON-NLS-1$
-		String NAMED_STORED_PROCEDURE_QUERY__NAME = "name"; //$NON-NLS-1$
-		String NAMED_STORED_PROCEDURE_QUERY__HINT = "hint"; //$NON-NLS-1$
-		String NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS = "result-class"; //$NON-NLS-1$
-		String NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING = "result-set-mapping"; //$NON-NLS-1$
-		String NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = "procedure-name"; //$NON-NLS-1$
-		String NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET = "returns-result-set"; //$NON-NLS-1$
-	String NAMED_STORED_PROCEDURE_QUERY__PARAMETER = "parameter"; //$NON-NLS-1$
-		String PARAMETER__DIRECTION = "direction"; //$NON-NLS-1$
-		String PARAMETER__NAME = "name"; //$NON-NLS-1$
-		String PARAMETER__QUERY_PARAMETER = "query-parameter"; //$NON-NLS-1$
-		String PARAMETER__TYPE = "type"; //$NON-NLS-1$
-		String PARAMETER__JDBC_TYPE = "jdbc-type"; //$NON-NLS-1$
-		String PARAMETER__JDBC_TYPE_NAME = "jdbc-type-name"; //$NON-NLS-1$
-		
-
-	String OBJECT_TYPE_CONVERTER = "object-type-converter"; //$NON-NLS-1$
-	String OBJECT_TYPE_CONVERTER__NAME = "name"; //$NON-NLS-1$
-	String OBJECT_TYPE_CONVERTER__DATA_TYPE = "data-type"; //$NON-NLS-1$
-	String OBJECT_TYPE_CONVERTER__OBJECT_TYPE = "object-type"; //$NON-NLS-1$
-	String OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE = "default-object-value"; //$NON-NLS-1$
-
-	String OPTIMISTIC_LOCKING = "optimistic-locking"; //$NON-NLS-1$
-		String OPTIMISTIC_LOCKING__SELECTED_COLUMN = "selected-column"; //$NON-NLS-1$
-		String OPTIMISTIC_LOCKING__TYPE = "type"; //$NON-NLS-1$
-		String OPTIMISTIC_LOCKING__CASCADE = "cascade"; //$NON-NLS-1$
-
-	String PRIVATE_OWNED = "private-owned";  //$NON-NLS-1$
-	
-	String PROPERTY = "property"; //$NON-NLS-1$
-	String PROPERTY__NAME = "name"; //$NON-NLS-1$
-	String PROPERTY__VALUE = "value"; //$NON-NLS-1$
-	String PROPERTY__VALUE_TYPE = "value-type"; //$NON-NLS-1$
-	
-	String READ_ONLY = "read-only";  //$NON-NLS-1$
-	
-	
-	String STRUCT_CONVERTER = "struct-converter"; //$NON-NLS-1$
-	String STRUCT_CONVERTER__NAME = "name"; //$NON-NLS-1$
-	String STRUCT_CONVERTER__CONVERTER = "converter"; //$NON-NLS-1$
-	
-	String TRANSFORMATION = "transformation";  //$NON-NLS-1$
-
-	String TYPE = "type";  //$NON-NLS-1$
-	
-	String TYPE_CONVERTER = "type-converter"; //$NON-NLS-1$
-	String TYPE_CONVERTER__NAME = "name"; //$NON-NLS-1$
-	String TYPE_CONVERTER__DATA_TYPE = "data-type"; //$NON-NLS-1$
-	String TYPE_CONVERTER__OBJECT_TYPE = "object-type"; //$NON-NLS-1$
-		
-	String VARIABLE_ONE_TO_ONE = "variable-one-to-one";  //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
deleted file mode 100644
index 4da6baf902..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
+++ /dev/null
@@ -1,1199 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage
- * @generated
- */
-public class EclipseLinkOrmFactory extends EFactoryImpl
-{
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmFactory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EclipseLinkOrmFactory init()
-	{
-		try
-		{
-			EclipseLinkOrmFactory theEclipseLinkOrmFactory = (EclipseLinkOrmFactory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.xmi"); 
-			if (theEclipseLinkOrmFactory != null)
-			{
-				return theEclipseLinkOrmFactory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EclipseLinkOrmFactory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmFactory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			case EclipseLinkOrmPackage.XML_ACCESS_METHODS: return (EObject)createXmlAccessMethods();
-			case EclipseLinkOrmPackage.XML_ADDITIONAL_CRITERIA: return (EObject)createXmlAdditionalCriteria();
-			case EclipseLinkOrmPackage.XML_ARRAY: return (EObject)createXmlArray();
-			case EclipseLinkOrmPackage.ATTRIBUTES: return (EObject)createAttributes();
-			case EclipseLinkOrmPackage.XML_BASIC: return (EObject)createXmlBasic();
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION: return (EObject)createXmlBasicCollection();
-			case EclipseLinkOrmPackage.XML_BASIC_MAP: return (EObject)createXmlBasicMap();
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH: return (EObject)createXmlBatchFetch();
-			case EclipseLinkOrmPackage.XML_CACHE: return (EObject)createXmlCache();
-			case EclipseLinkOrmPackage.XML_CACHE_INDEX: return (EObject)createXmlCacheIndex();
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING: return (EObject)createXmlChangeTracking();
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY: return (EObject)createXmlCloneCopyPolicy();
-			case EclipseLinkOrmPackage.XML_COLLECTION_TABLE: return (EObject)createXmlCollectionTable();
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE: return (EObject)createXmlConversionValue();
-			case EclipseLinkOrmPackage.XML_CONVERTER: return (EObject)createXmlConverter();
-			case EclipseLinkOrmPackage.XML_COPY_POLICY: return (EObject)createXmlCopyPolicy();
-			case EclipseLinkOrmPackage.XML_CUSTOMIZER: return (EObject)createXmlCustomizer();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION: return (EObject)createXmlElementCollection();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE: return (EObject)createXmlEmbeddable();
-			case EclipseLinkOrmPackage.XML_EMBEDDED: return (EObject)createXmlEmbedded();
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID: return (EObject)createXmlEmbeddedId();
-			case EclipseLinkOrmPackage.XML_ENTITY: return (EObject)createXmlEntity();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS: return (EObject)createXmlEntityMappings();
-			case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE: return (EObject)createXmlFetchAttribute();
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP: return (EObject)createXmlFetchGroup();
-			case EclipseLinkOrmPackage.XML_HASH_PARTITIONING: return (EObject)createXmlHashPartitioning();
-			case EclipseLinkOrmPackage.XML_ID: return (EObject)createXmlId();
-			case EclipseLinkOrmPackage.XML_INDEX: return (EObject)createXmlIndex();
-			case EclipseLinkOrmPackage.XML_INSTANTIATION_COPY_POLICY: return (EObject)createXmlInstantiationCopyPolicy();
-			case EclipseLinkOrmPackage.XML_JOIN_TABLE: return (EObject)createXmlJoinTable();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY: return (EObject)createXmlManyToMany();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE: return (EObject)createXmlManyToOne();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS: return (EObject)createXmlMappedSuperclass();
-			case EclipseLinkOrmPackage.XML_MULTITENANT: return (EObject)createXmlMultitenant();
-			case EclipseLinkOrmPackage.XML_NAMED_CONVERTER: return (EObject)createXmlNamedConverter();
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY: return (EObject)createXmlNamedPlsqlStoredFunctionQuery();
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY: return (EObject)createXmlNamedPlsqlStoredProcedureQuery();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_FUNCTION_QUERY: return (EObject)createXmlNamedStoredFunctionQuery();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY: return (EObject)createXmlNamedStoredProcedureQuery();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER: return (EObject)createXmlObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY: return (EObject)createXmlOneToMany();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE: return (EObject)createXmlOneToOne();
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING: return (EObject)createXmlOptimisticLocking();
-			case EclipseLinkOrmPackage.XML_ORDER_COLUMN: return (EObject)createXmlOrderColumn();
-			case EclipseLinkOrmPackage.XML_PARTITIONING: return (EObject)createXmlPartitioning();
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS: return (EObject)createXmlPersistenceUnitDefaults();
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_METADATA: return (EObject)createXmlPersistenceUnitMetadata();
-			case EclipseLinkOrmPackage.XML_PINNED_PARTITIONING: return (EObject)createXmlPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_PLSQL_RECORD: return (EObject)createXmlPlsqlRecord();
-			case EclipseLinkOrmPackage.XML_PLSQL_TABLE: return (EObject)createXmlPlsqlTable();
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY: return (EObject)createXmlPrimaryKey();
-			case EclipseLinkOrmPackage.XML_PROPERTY: return (EObject)createXmlProperty();
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS: return (EObject)createXmlQueryRedirectors();
-			case EclipseLinkOrmPackage.XML_RANGE_PARTITIONING: return (EObject)createXmlRangePartitioning();
-			case EclipseLinkOrmPackage.XML_REPLICATION_PARTITIONING: return (EObject)createXmlReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_RETURN_INSERT: return (EObject)createXmlReturnInsert();
-			case EclipseLinkOrmPackage.XML_ROUND_ROBIN_PARTITIONING: return (EObject)createXmlRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_SECONDARY_TABLE: return (EObject)createXmlSecondaryTable();
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER: return (EObject)createXmlStoredProcedureParameter();
-			case EclipseLinkOrmPackage.XML_STRUCT: return (EObject)createXmlStruct();
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER: return (EObject)createXmlStructConverter();
-			case EclipseLinkOrmPackage.XML_STRUCTURE: return (EObject)createXmlStructure();
-			case EclipseLinkOrmPackage.XML_TABLE: return (EObject)createXmlTable();
-			case EclipseLinkOrmPackage.XML_TABLE_GENERATOR: return (EObject)createXmlTableGenerator();
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN: return (EObject)createXmlTenantDiscriminatorColumn();
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY: return (EObject)createXmlTimeOfDay();
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION: return (EObject)createXmlTransformation();
-			case EclipseLinkOrmPackage.XML_TRANSIENT: return (EObject)createXmlTransient();
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER: return (EObject)createXmlTypeConverter();
-			case EclipseLinkOrmPackage.XML_UNION_PARTITIONING: return (EObject)createXmlUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_VALUE_PARTITIONING: return (EObject)createXmlValuePartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE: return (EObject)createXmlVariableOneToOne();
-			case EclipseLinkOrmPackage.XML_VERSION: return (EObject)createXmlVersion();
-			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 EclipseLinkOrmPackage.CACHE_COORDINATION_TYPE:
-				return createCacheCoordinationTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.CACHE_TYPE:
-				return createCacheTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_TYPE:
-				return createXmlChangeTrackingTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.XML_DIRECTION:
-				return createXmlDirectionFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.EXISTENCE_TYPE:
-				return createExistenceTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.XML_JOIN_FETCH_TYPE:
-				return createXmlJoinFetchTypeFromString(eDataType, initialValue);
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING_TYPE:
-				return createXmlOptimisticLockingTypeFromString(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 EclipseLinkOrmPackage.CACHE_COORDINATION_TYPE:
-				return convertCacheCoordinationTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.CACHE_TYPE:
-				return convertCacheTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_TYPE:
-				return convertXmlChangeTrackingTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.XML_DIRECTION:
-				return convertXmlDirectionToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.EXISTENCE_TYPE:
-				return convertExistenceTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.XML_JOIN_FETCH_TYPE:
-				return convertXmlJoinFetchTypeToString(eDataType, instanceValue);
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING_TYPE:
-				return convertXmlOptimisticLockingTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlAccessMethods createXmlAccessMethods()
-	{
-		XmlAccessMethods xmlAccessMethods = new XmlAccessMethods();
-		return xmlAccessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlAdditionalCriteria createXmlAdditionalCriteria()
-	{
-		XmlAdditionalCriteria xmlAdditionalCriteria = new XmlAdditionalCriteria();
-		return xmlAdditionalCriteria;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlArray createXmlArray()
-	{
-		XmlArray xmlArray = new XmlArray();
-		return xmlArray;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Attributes createAttributes()
-	{
-		Attributes attributes = new Attributes();
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasic createXmlBasic()
-	{
-		XmlBasic xmlBasic = new XmlBasic();
-		return xmlBasic;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasicCollection createXmlBasicCollection()
-	{
-		XmlBasicCollection xmlBasicCollection = new XmlBasicCollection();
-		return xmlBasicCollection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBasicMap createXmlBasicMap()
-	{
-		XmlBasicMap xmlBasicMap = new XmlBasicMap();
-		return xmlBasicMap;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlBatchFetch createXmlBatchFetch()
-	{
-		XmlBatchFetch xmlBatchFetch = new XmlBatchFetch();
-		return xmlBatchFetch;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCache createXmlCache()
-	{
-		XmlCache xmlCache = new XmlCache();
-		return xmlCache;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCacheIndex createXmlCacheIndex()
-	{
-		XmlCacheIndex xmlCacheIndex = new XmlCacheIndex();
-		return xmlCacheIndex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlChangeTracking createXmlChangeTracking()
-	{
-		XmlChangeTracking xmlChangeTracking = new XmlChangeTracking();
-		return xmlChangeTracking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCloneCopyPolicy createXmlCloneCopyPolicy()
-	{
-		XmlCloneCopyPolicy xmlCloneCopyPolicy = new XmlCloneCopyPolicy();
-		return xmlCloneCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCollectionTable createXmlCollectionTable()
-	{
-		XmlCollectionTable xmlCollectionTable = new XmlCollectionTable();
-		return xmlCollectionTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlConversionValue createXmlConversionValue()
-	{
-		XmlConversionValue xmlConversionValue = new XmlConversionValue();
-		return xmlConversionValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlConverter createXmlConverter()
-	{
-		XmlConverter xmlConverter = new XmlConverter();
-		return xmlConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCopyPolicy createXmlCopyPolicy()
-	{
-		XmlCopyPolicy xmlCopyPolicy = new XmlCopyPolicy();
-		return xmlCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlCustomizer createXmlCustomizer()
-	{
-		XmlCustomizer xmlCustomizer = new XmlCustomizer();
-		return xmlCustomizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlElementCollection createXmlElementCollection()
-	{
-		XmlElementCollection xmlElementCollection = new XmlElementCollection();
-		return xmlElementCollection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddable createXmlEmbeddable()
-	{
-		XmlEmbeddable xmlEmbeddable = new XmlEmbeddable();
-		return xmlEmbeddable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbedded createXmlEmbedded()
-	{
-		XmlEmbedded xmlEmbedded = new XmlEmbedded();
-		return xmlEmbedded;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEmbeddedId createXmlEmbeddedId()
-	{
-		XmlEmbeddedId xmlEmbeddedId = new XmlEmbeddedId();
-		return xmlEmbeddedId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEntity createXmlEntity()
-	{
-		XmlEntity xmlEntity = new XmlEntity();
-		return xmlEntity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlEntityMappings createXmlEntityMappings()
-	{
-		XmlEntityMappings xmlEntityMappings = new XmlEntityMappings();
-		return xmlEntityMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlFetchAttribute createXmlFetchAttribute()
-	{
-		XmlFetchAttribute xmlFetchAttribute = new XmlFetchAttribute();
-		return xmlFetchAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlFetchGroup createXmlFetchGroup()
-	{
-		XmlFetchGroup xmlFetchGroup = new XmlFetchGroup();
-		return xmlFetchGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlId createXmlId()
-	{
-		XmlId xmlId = new XmlId();
-		return xmlId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlIndex createXmlIndex()
-	{
-		XmlIndex xmlIndex = new XmlIndex();
-		return xmlIndex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlInstantiationCopyPolicy createXmlInstantiationCopyPolicy()
-	{
-		XmlInstantiationCopyPolicy xmlInstantiationCopyPolicy = new XmlInstantiationCopyPolicy();
-		return xmlInstantiationCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlJoinTable createXmlJoinTable()
-	{
-		XmlJoinTable xmlJoinTable = new XmlJoinTable();
-		return xmlJoinTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlManyToMany createXmlManyToMany()
-	{
-		XmlManyToMany xmlManyToMany = new XmlManyToMany();
-		return xmlManyToMany;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlManyToOne createXmlManyToOne()
-	{
-		XmlManyToOne xmlManyToOne = new XmlManyToOne();
-		return xmlManyToOne;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlMappedSuperclass createXmlMappedSuperclass()
-	{
-		XmlMappedSuperclass xmlMappedSuperclass = new XmlMappedSuperclass();
-		return xmlMappedSuperclass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlMultitenant createXmlMultitenant()
-	{
-		XmlMultitenant xmlMultitenant = new XmlMultitenant();
-		return xmlMultitenant;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlNamedConverter createXmlNamedConverter()
-	{
-		XmlNamedConverter xmlNamedConverter = new XmlNamedConverter();
-		return xmlNamedConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlNamedPlsqlStoredFunctionQuery createXmlNamedPlsqlStoredFunctionQuery()
-	{
-		XmlNamedPlsqlStoredFunctionQuery xmlNamedPlsqlStoredFunctionQuery = new XmlNamedPlsqlStoredFunctionQuery();
-		return xmlNamedPlsqlStoredFunctionQuery;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlNamedPlsqlStoredProcedureQuery createXmlNamedPlsqlStoredProcedureQuery()
-	{
-		XmlNamedPlsqlStoredProcedureQuery xmlNamedPlsqlStoredProcedureQuery = new XmlNamedPlsqlStoredProcedureQuery();
-		return xmlNamedPlsqlStoredProcedureQuery;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlNamedStoredFunctionQuery createXmlNamedStoredFunctionQuery()
-	{
-		XmlNamedStoredFunctionQuery xmlNamedStoredFunctionQuery = new XmlNamedStoredFunctionQuery();
-		return xmlNamedStoredFunctionQuery;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlNamedStoredProcedureQuery createXmlNamedStoredProcedureQuery()
-	{
-		XmlNamedStoredProcedureQuery xmlNamedStoredProcedureQuery = new XmlNamedStoredProcedureQuery();
-		return xmlNamedStoredProcedureQuery;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlObjectTypeConverter createXmlObjectTypeConverter()
-	{
-		XmlObjectTypeConverter xmlObjectTypeConverter = new XmlObjectTypeConverter();
-		return xmlObjectTypeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOneToMany createXmlOneToMany()
-	{
-		XmlOneToMany xmlOneToMany = new XmlOneToMany();
-		return xmlOneToMany;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOneToOne createXmlOneToOne()
-	{
-		XmlOneToOne xmlOneToOne = new XmlOneToOne();
-		return xmlOneToOne;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOptimisticLocking createXmlOptimisticLocking()
-	{
-		XmlOptimisticLocking xmlOptimisticLocking = new XmlOptimisticLocking();
-		return xmlOptimisticLocking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOrderColumn createXmlOrderColumn()
-	{
-		XmlOrderColumn xmlOrderColumn = new XmlOrderColumn();
-		return xmlOrderColumn;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPersistenceUnitDefaults createXmlPersistenceUnitDefaults()
-	{
-		XmlPersistenceUnitDefaults xmlPersistenceUnitDefaults = new XmlPersistenceUnitDefaults();
-		return xmlPersistenceUnitDefaults;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPersistenceUnitMetadata createXmlPersistenceUnitMetadata()
-	{
-		XmlPersistenceUnitMetadata xmlPersistenceUnitMetadata = new XmlPersistenceUnitMetadata();
-		return xmlPersistenceUnitMetadata;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPrimaryKey createXmlPrimaryKey()
-	{
-		XmlPrimaryKey xmlPrimaryKey = new XmlPrimaryKey();
-		return xmlPrimaryKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlProperty createXmlProperty()
-	{
-		XmlProperty xmlProperty = new XmlProperty();
-		return xmlProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlQueryRedirectors createXmlQueryRedirectors()
-	{
-		XmlQueryRedirectors xmlQueryRedirectors = new XmlQueryRedirectors();
-		return xmlQueryRedirectors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlReturnInsert createXmlReturnInsert()
-	{
-		XmlReturnInsert xmlReturnInsert = new XmlReturnInsert();
-		return xmlReturnInsert;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlSecondaryTable createXmlSecondaryTable()
-	{
-		XmlSecondaryTable xmlSecondaryTable = new XmlSecondaryTable();
-		return xmlSecondaryTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlStoredProcedureParameter createXmlStoredProcedureParameter()
-	{
-		XmlStoredProcedureParameter xmlStoredProcedureParameter = new XmlStoredProcedureParameter();
-		return xmlStoredProcedureParameter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlStruct createXmlStruct()
-	{
-		XmlStruct xmlStruct = new XmlStruct();
-		return xmlStruct;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlStructConverter createXmlStructConverter()
-	{
-		XmlStructConverter xmlStructConverter = new XmlStructConverter();
-		return xmlStructConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlStructure createXmlStructure()
-	{
-		XmlStructure xmlStructure = new XmlStructure();
-		return xmlStructure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTable createXmlTable()
-	{
-		XmlTable xmlTable = new XmlTable();
-		return xmlTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTableGenerator createXmlTableGenerator()
-	{
-		XmlTableGenerator xmlTableGenerator = new XmlTableGenerator();
-		return xmlTableGenerator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTenantDiscriminatorColumn createXmlTenantDiscriminatorColumn()
-	{
-		XmlTenantDiscriminatorColumn xmlTenantDiscriminatorColumn = new XmlTenantDiscriminatorColumn();
-		return xmlTenantDiscriminatorColumn;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTimeOfDay createXmlTimeOfDay()
-	{
-		XmlTimeOfDay xmlTimeOfDay = new XmlTimeOfDay();
-		return xmlTimeOfDay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTransformation createXmlTransformation()
-	{
-		XmlTransformation xmlTransformation = new XmlTransformation();
-		return xmlTransformation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTransient createXmlTransient()
-	{
-		XmlTransient xmlTransient = new XmlTransient();
-		return xmlTransient;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlTypeConverter createXmlTypeConverter()
-	{
-		XmlTypeConverter xmlTypeConverter = new XmlTypeConverter();
-		return xmlTypeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlVariableOneToOne createXmlVariableOneToOne()
-	{
-		XmlVariableOneToOne xmlVariableOneToOne = new XmlVariableOneToOne();
-		return xmlVariableOneToOne;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlVersion createXmlVersion()
-	{
-		XmlVersion xmlVersion = new XmlVersion();
-		return xmlVersion;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlHashPartitioning createXmlHashPartitioning()
-	{
-		XmlHashPartitioning xmlHashPartitioning = new XmlHashPartitioning();
-		return xmlHashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPartitioning createXmlPartitioning()
-	{
-		XmlPartitioning xmlPartitioning = new XmlPartitioning();
-		return xmlPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPinnedPartitioning createXmlPinnedPartitioning()
-	{
-		XmlPinnedPartitioning xmlPinnedPartitioning = new XmlPinnedPartitioning();
-		return xmlPinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPlsqlRecord createXmlPlsqlRecord()
-	{
-		XmlPlsqlRecord xmlPlsqlRecord = new XmlPlsqlRecord();
-		return xmlPlsqlRecord;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlPlsqlTable createXmlPlsqlTable()
-	{
-		XmlPlsqlTable xmlPlsqlTable = new XmlPlsqlTable();
-		return xmlPlsqlTable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlRangePartitioning createXmlRangePartitioning()
-	{
-		XmlRangePartitioning xmlRangePartitioning = new XmlRangePartitioning();
-		return xmlRangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlReplicationPartitioning createXmlReplicationPartitioning()
-	{
-		XmlReplicationPartitioning xmlReplicationPartitioning = new XmlReplicationPartitioning();
-		return xmlReplicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning createXmlRoundRobinPartitioning()
-	{
-		XmlRoundRobinPartitioning xmlRoundRobinPartitioning = new XmlRoundRobinPartitioning();
-		return xmlRoundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlUnionPartitioning createXmlUnionPartitioning()
-	{
-		XmlUnionPartitioning xmlUnionPartitioning = new XmlUnionPartitioning();
-		return xmlUnionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlValuePartitioning createXmlValuePartitioning()
-	{
-		XmlValuePartitioning xmlValuePartitioning = new XmlValuePartitioning();
-		return xmlValuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CacheCoordinationType createCacheCoordinationTypeFromString(EDataType eDataType, String initialValue)
-	{
-		CacheCoordinationType result = CacheCoordinationType.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 convertCacheCoordinationTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CacheType createCacheTypeFromString(EDataType eDataType, String initialValue)
-	{
-		CacheType result = CacheType.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 convertCacheTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlChangeTrackingType createXmlChangeTrackingTypeFromString(EDataType eDataType, String initialValue)
-	{
-		XmlChangeTrackingType result = XmlChangeTrackingType.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 convertXmlChangeTrackingTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlDirection createXmlDirectionFromString(EDataType eDataType, String initialValue)
-	{
-		XmlDirection result = XmlDirection.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 convertXmlDirectionToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExistenceType createExistenceTypeFromString(EDataType eDataType, String initialValue)
-	{
-		ExistenceType result = ExistenceType.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 convertExistenceTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlJoinFetchType createXmlJoinFetchTypeFromString(EDataType eDataType, String initialValue)
-	{
-		XmlJoinFetchType result = XmlJoinFetchType.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 convertXmlJoinFetchTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XmlOptimisticLockingType createXmlOptimisticLockingTypeFromString(EDataType eDataType, String initialValue)
-	{
-		XmlOptimisticLockingType result = XmlOptimisticLockingType.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 convertXmlOptimisticLockingTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmPackage getEclipseLinkOrmPackage()
-	{
-		return (EclipseLinkOrmPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EclipseLinkOrmPackage getPackage()
-	{
-		return EclipseLinkOrmPackage.eINSTANCE;
-	}
-	
-}
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
deleted file mode 100644
index 3ff7a45877..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ /dev/null
@@ -1,12862 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-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.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
-
-/**
- * <!-- 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory
- * @model kind="package"
- * @generated
- */
-public class EclipseLinkOrmPackage extends EPackageImpl
-{
-
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNAME = "orm";
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_URI = "jpt.eclipselink.orm.xmi";
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.jpa.eclipselink.core.resource.orm";
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmPackage eINSTANCE = org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage.init();
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods <em>Xml Access Methods</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethods()
-	 * @generated
-	 */
-	public static final int XML_ACCESS_METHODS = 0;
-	/**
-	 * The feature id for the '<em><b>Get Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_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 XML_ACCESS_METHODS__SET_METHOD = 1;
-	/**
-	 * The number of structural features of the '<em>Xml Access Methods</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ACCESS_METHODS_FEATURE_COUNT = 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder <em>Xml Access Methods Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder()
-	 * @generated
-	 */
-	public static final int XML_ACCESS_METHODS_HOLDER = 1;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Access Methods Holder</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria <em>Xml Additional Criteria</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAdditionalCriteria()
-	 * @generated
-	 */
-	public static final int XML_ADDITIONAL_CRITERIA = 2;
-	/**
-	 * The feature id for the '<em><b>Criteria</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ADDITIONAL_CRITERIA__CRITERIA = EclipseLinkOrmV2_2Package.XML_ADDITIONAL_CRITERIA_22__CRITERIA;
-	/**
-	 * The number of structural features of the '<em>Xml Additional Criteria</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ADDITIONAL_CRITERIA_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_ADDITIONAL_CRITERIA_22_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray <em>Xml Array</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlArray()
-	 * @generated
-	 */
-	public static final int XML_ARRAY = 3;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ARRAY__ACCESS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ARRAY__NAME = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ARRAY__ACCESS_METHODS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ARRAY__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Xml Array</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ARRAY_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAttributeMapping()
-	 * @generated
-	 */
-	public static final int XML_ATTRIBUTE_MAPPING = 4;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTE_MAPPING__ACCESS = OrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTE_MAPPING__NAME = OrmPackage.XML_ATTRIBUTE_MAPPING__NAME;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTE_MAPPING__ACCESS_METHODS = OrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTE_MAPPING__PROPERTIES = OrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Xml Attribute Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTE_MAPPING_FEATURE_COUNT = OrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes <em>Attributes</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes()
-	 * @generated
-	 */
-	public static final int ATTRIBUTES = 5;
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__DESCRIPTION = OrmPackage.ATTRIBUTES__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Element Collections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__ELEMENT_COLLECTIONS = OrmPackage.ATTRIBUTES__ELEMENT_COLLECTIONS;
-	/**
-	 * The feature id for the '<em><b>Ids</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__IDS = OrmPackage.ATTRIBUTES__IDS;
-	/**
-	 * The feature id for the '<em><b>Embedded Ids</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__EMBEDDED_IDS = OrmPackage.ATTRIBUTES__EMBEDDED_IDS;
-	/**
-	 * The feature id for the '<em><b>Basics</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__BASICS = OrmPackage.ATTRIBUTES__BASICS;
-	/**
-	 * The feature id for the '<em><b>Versions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__VERSIONS = OrmPackage.ATTRIBUTES__VERSIONS;
-	/**
-	 * The feature id for the '<em><b>Many To Ones</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__MANY_TO_ONES = OrmPackage.ATTRIBUTES__MANY_TO_ONES;
-	/**
-	 * The feature id for the '<em><b>One To Manys</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__ONE_TO_MANYS = OrmPackage.ATTRIBUTES__ONE_TO_MANYS;
-	/**
-	 * The feature id for the '<em><b>One To Ones</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__ONE_TO_ONES = OrmPackage.ATTRIBUTES__ONE_TO_ONES;
-	/**
-	 * The feature id for the '<em><b>Many To Manys</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__MANY_TO_MANYS = OrmPackage.ATTRIBUTES__MANY_TO_MANYS;
-	/**
-	 * The feature id for the '<em><b>Embeddeds</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__EMBEDDEDS = OrmPackage.ATTRIBUTES__EMBEDDEDS;
-	/**
-	 * The feature id for the '<em><b>Transients</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__TRANSIENTS = OrmPackage.ATTRIBUTES__TRANSIENTS;
-	/**
-	 * The feature id for the '<em><b>Structures</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__STRUCTURES = OrmPackage.ATTRIBUTES_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Arrays</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__ARRAYS = OrmPackage.ATTRIBUTES_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Basic Collections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__BASIC_COLLECTIONS = OrmPackage.ATTRIBUTES_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Basic Maps</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__BASIC_MAPS = OrmPackage.ATTRIBUTES_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Transformations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__TRANSFORMATIONS = OrmPackage.ATTRIBUTES_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Variable One To Ones</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES__VARIABLE_ONE_TO_ONES = OrmPackage.ATTRIBUTES_FEATURE_COUNT + 5;
-	/**
-	 * The number of structural features of the '<em>Attributes</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTES_FEATURE_COUNT = OrmPackage.ATTRIBUTES_FEATURE_COUNT + 6;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic()
-	 * @generated
-	 */
-	public static final int XML_BASIC = 6;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__ACCESS = OrmPackage.XML_BASIC__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__NAME = OrmPackage.XML_BASIC__NAME;
-	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__COLUMN = OrmPackage.XML_BASIC__COLUMN;
-	/**
-	 * The feature id for the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__LOB = OrmPackage.XML_BASIC__LOB;
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__TEMPORAL = OrmPackage.XML_BASIC__TEMPORAL;
-	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__ENUMERATED = OrmPackage.XML_BASIC__ENUMERATED;
-	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__FETCH = OrmPackage.XML_BASIC__FETCH;
-	/**
-	 * The feature id for the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__OPTIONAL = OrmPackage.XML_BASIC__OPTIONAL;
-	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__SEQUENCE_GENERATOR = OrmPackage.XML_BASIC_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__TABLE_GENERATOR = OrmPackage.XML_BASIC_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Generated Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__GENERATED_VALUE = OrmPackage.XML_BASIC_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Return Insert</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__RETURN_INSERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Return Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__RETURN_UPDATE = OrmPackage.XML_BASIC_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__ATTRIBUTE_TYPE = OrmPackage.XML_BASIC_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__INDEX = OrmPackage.XML_BASIC_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__CACHE_INDEX = OrmPackage.XML_BASIC_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__ACCESS_METHODS = OrmPackage.XML_BASIC_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__PROPERTIES = OrmPackage.XML_BASIC_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__MUTABLE = OrmPackage.XML_BASIC_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__OBJECT_TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__STRUCT_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC__CONVERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 15;
-	/**
-	 * The number of structural features of the '<em>Xml Basic</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_FEATURE_COUNT = OrmPackage.XML_BASIC_FEATURE_COUNT + 16;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection()
-	 * @generated
-	 */
-	public static final int XML_BASIC_COLLECTION = 7;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION__ACCESS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION__NAME = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION__ACCESS_METHODS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION__CASCADE_ON_DELETE = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-	/**
-	 * The number of structural features of the '<em>Xml Basic Collection</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap()
-	 * @generated
-	 */
-	public static final int XML_BASIC_MAP = 8;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP__ACCESS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP__NAME = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP__ACCESS_METHODS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP__CASCADE_ON_DELETE = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-	/**
-	 * The number of structural features of the '<em>Xml Basic Map</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetch <em>Xml Batch Fetch</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetch
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch()
-	 * @generated
-	 */
-	public static final int XML_BATCH_FETCH = 9;
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BATCH_FETCH__SIZE = EclipseLinkOrmV2_1Package.XML_BATCH_FETCH_21__SIZE;
-	/**
-	 * The feature id for the '<em><b>Batch Fetch Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BATCH_FETCH__BATCH_FETCH_TYPE = EclipseLinkOrmV2_1Package.XML_BATCH_FETCH_21__BATCH_FETCH_TYPE;
-	/**
-	 * The number of structural features of the '<em>Xml Batch Fetch</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BATCH_FETCH_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_BATCH_FETCH_21_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder <em>Xml Batch Fetch Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder()
-	 * @generated
-	 */
-	public static final int XML_BATCH_FETCH_HOLDER = 10;
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BATCH_FETCH_HOLDER__BATCH_FETCH = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Batch Fetch Holder</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BATCH_FETCH_HOLDER_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache <em>Xml Cache</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache()
-	 * @generated
-	 */
-	public static final int XML_CACHE = 11;
-	/**
-	 * The feature id for the '<em><b>Expiry</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__EXPIRY = 0;
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__SIZE = 1;
-	/**
-	 * The feature id for the '<em><b>Shared</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__SHARED = 2;
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__TYPE = 3;
-	/**
-	 * The feature id for the '<em><b>Always Refresh</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__ALWAYS_REFRESH = 4;
-	/**
-	 * The feature id for the '<em><b>Refresh Only If Newer</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__REFRESH_ONLY_IF_NEWER = 5;
-	/**
-	 * The feature id for the '<em><b>Disable Hits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__DISABLE_HITS = 6;
-	/**
-	 * The feature id for the '<em><b>Coordination Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__COORDINATION_TYPE = 7;
-	/**
-	 * The feature id for the '<em><b>Expiry Time Of Day</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE__EXPIRY_TIME_OF_DAY = 8;
-	/**
-	 * The number of structural features of the '<em>Xml Cache</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE_FEATURE_COUNT = 9;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder <em>Xml Cache Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder()
-	 * @generated
-	 */
-	public static final int XML_CACHE_HOLDER = 12;
-	/**
-	 * The feature id for the '<em><b>Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE_HOLDER__CACHE = 0;
-	/**
-	 * The feature id for the '<em><b>Existence Checking</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE_HOLDER__EXISTENCE_CHECKING = 1;
-	/**
-	 * The number of structural features of the '<em>Xml Cache Holder</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE_HOLDER_FEATURE_COUNT = 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex <em>Xml Cache Index</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheIndex()
-	 * @generated
-	 */
-	public static final int XML_CACHE_INDEX = 13;
-	/**
-	 * The feature id for the '<em><b>Column Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE_INDEX__COLUMN_NAMES = EclipseLinkOrmV2_4Package.XML_CACHE_INDEX_24__COLUMN_NAMES;
-	/**
-	 * The number of structural features of the '<em>Xml Cache Index</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE_INDEX_FEATURE_COUNT = EclipseLinkOrmV2_4Package.XML_CACHE_INDEX_24_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking <em>Xml Change Tracking</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking()
-	 * @generated
-	 */
-	public static final int XML_CHANGE_TRACKING = 14;
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CHANGE_TRACKING__TYPE = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Change Tracking</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CHANGE_TRACKING_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder <em>Xml Change Tracking Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder()
-	 * @generated
-	 */
-	public static final int XML_CHANGE_TRACKING_HOLDER = 15;
-	/**
-	 * The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Change Tracking Holder</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CHANGE_TRACKING_HOLDER_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy <em>Xml Clone Copy Policy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy()
-	 * @generated
-	 */
-	public static final int XML_CLONE_COPY_POLICY = 16;
-	/**
-	 * The feature id for the '<em><b>Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CLONE_COPY_POLICY__METHOD = 0;
-	/**
-	 * The feature id for the '<em><b>Working Copy Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD = 1;
-	/**
-	 * The number of structural features of the '<em>Xml Clone Copy Policy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CLONE_COPY_POLICY_FEATURE_COUNT = 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCollectionTable
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionTable()
-	 * @generated
-	 */
-	public static final int XML_COLLECTION_TABLE = 17;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE__NAME = OrmPackage.XML_COLLECTION_TABLE__NAME;
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE__CATALOG = OrmPackage.XML_COLLECTION_TABLE__CATALOG;
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE__SCHEMA = OrmPackage.XML_COLLECTION_TABLE__SCHEMA;
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE__UNIQUE_CONSTRAINTS = OrmPackage.XML_COLLECTION_TABLE__UNIQUE_CONSTRAINTS;
-	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE__JOIN_COLUMNS = OrmPackage.XML_COLLECTION_TABLE__JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE__CREATION_SUFFIX = OrmPackage.XML_COLLECTION_TABLE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Collection Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE_FEATURE_COUNT = OrmPackage.XML_COLLECTION_TABLE_FEATURE_COUNT + 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
-	 * @generated
-	 */
-	public static final int XML_CONVERSION_VALUE = 18;
-	/**
-	 * The feature id for the '<em><b>Data Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERSION_VALUE__DATA_VALUE = 0;
-	/**
-	 * The feature id for the '<em><b>Object Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERSION_VALUE__OBJECT_VALUE = 1;
-	/**
-	 * The number of structural features of the '<em>Xml Conversion Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERSION_VALUE_FEATURE_COUNT = 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter <em>Xml Named Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter()
-	 * @generated
-	 */
-	public static final int XML_NAMED_CONVERTER = 45;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_CONVERTER__NAME = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Named Converter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_CONVERTER_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter <em>Xml Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter()
-	 * @generated
-	 */
-	public static final int XML_CONVERTER = 19;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER__NAME = XML_NAMED_CONVERTER__NAME;
-	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER__CLASS_NAME = XML_NAMED_CONVERTER_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Converter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER_FEATURE_COUNT = XML_NAMED_CONVERTER_FEATURE_COUNT + 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder()
-	 * @generated
-	 */
-	public static final int XML_CONVERTER_HOLDER = 20;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER_HOLDER__CONVERTER = 0;
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER_HOLDER__TYPE_CONVERTER = 1;
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER = 2;
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER_HOLDER__STRUCT_CONVERTER = 3;
-	/**
-	 * The number of structural features of the '<em>Xml Converter Holder</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTER_HOLDER_FEATURE_COUNT = 4;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder <em>Xml Converters Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder()
-	 * @generated
-	 */
-	public static final int XML_CONVERTERS_HOLDER = 21;
-	/**
-	 * The feature id for the '<em><b>Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTERS_HOLDER__CONVERTERS = 0;
-	/**
-	 * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTERS_HOLDER__TYPE_CONVERTERS = 1;
-	/**
-	 * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS = 2;
-	/**
-	 * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS = 3;
-	/**
-	 * The number of structural features of the '<em>Xml Converters Holder</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTERS_HOLDER_FEATURE_COUNT = 4;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping <em>Xml Convertible Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping()
-	 * @generated
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING = 22;
-	/**
-	 * The feature id for the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__LOB = OrmPackage.XML_CONVERTIBLE_MAPPING__LOB;
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__TEMPORAL = OrmPackage.XML_CONVERTIBLE_MAPPING__TEMPORAL;
-	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__ENUMERATED = OrmPackage.XML_CONVERTIBLE_MAPPING__ENUMERATED;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__CONVERTER = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__TYPE_CONVERTER = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__OBJECT_TYPE_CONVERTER = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__STRUCT_CONVERTER = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__CONVERT = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 4;
-	/**
-	 * The number of structural features of the '<em>Xml Convertible Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING_FEATURE_COUNT = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 5;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy <em>Xml Copy Policy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCopyPolicy()
-	 * @generated
-	 */
-	public static final int XML_COPY_POLICY = 23;
-	/**
-	 * The feature id for the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COPY_POLICY__CLASS = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Copy Policy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COPY_POLICY_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer <em>Xml Customizer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer()
-	 * @generated
-	 */
-	public static final int XML_CUSTOMIZER = 24;
-	/**
-	 * The feature id for the '<em><b>Customizer Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Customizer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CUSTOMIZER_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder <em>Xml Customizer Holder</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder()
-	 * @generated
-	 */
-	public static final int XML_CUSTOMIZER_HOLDER = 25;
-	/**
-	 * The feature id for the '<em><b>Customizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CUSTOMIZER_HOLDER__CUSTOMIZER = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Customizer Holder</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CUSTOMIZER_HOLDER_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection()
-	 * @generated
-	 */
-	public static final int XML_ELEMENT_COLLECTION = 26;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ACCESS = OrmPackage.XML_ELEMENT_COLLECTION__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__NAME = OrmPackage.XML_ELEMENT_COLLECTION__NAME;
-	/**
-	 * The feature id for the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__LOB = OrmPackage.XML_ELEMENT_COLLECTION__LOB;
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__TEMPORAL = OrmPackage.XML_ELEMENT_COLLECTION__TEMPORAL;
-	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ENUMERATED = OrmPackage.XML_ELEMENT_COLLECTION__ENUMERATED;
-	/**
-	 * The feature id for the '<em><b>Order Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ORDER_COLUMN = OrmPackage.XML_ELEMENT_COLLECTION__ORDER_COLUMN;
-	/**
-	 * The feature id for the '<em><b>Order By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ORDER_BY = OrmPackage.XML_ELEMENT_COLLECTION__ORDER_BY;
-	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ATTRIBUTE_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION__ASSOCIATION_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ATTRIBUTE_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_TEMPORAL;
-	/**
-	 * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ENUMERATED;
-	/**
-	 * The feature id for the '<em><b>Target Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__TARGET_CLASS = OrmPackage.XML_ELEMENT_COLLECTION__TARGET_CLASS;
-	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__FETCH = OrmPackage.XML_ELEMENT_COLLECTION__FETCH;
-	/**
-	 * The feature id for the '<em><b>Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY;
-	/**
-	 * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CLASS = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CLASS;
-	/**
-	 * The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_COLUMN;
-	/**
-	 * The feature id for the '<em><b>Map Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS = OrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__COLUMN = OrmPackage.XML_ELEMENT_COLLECTION__COLUMN;
-	/**
-	 * The feature id for the '<em><b>Collection Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__COLLECTION_TABLE = OrmPackage.XML_ELEMENT_COLLECTION__COLLECTION_TABLE;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ACCESS_METHODS = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__PROPERTIES = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__CONVERTER = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__TYPE_CONVERTER = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__STRUCT_CONVERTER = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__CONVERT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__CONVERTERS = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__TYPE_CONVERTERS = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Join Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__JOIN_FETCH = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__BATCH_FETCH = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__PARTITIONING = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 16;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 17;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 18;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__PINNED_PARTITIONING = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 19;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__RANGE_PARTITIONING = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 20;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__VALUE_PARTITIONING = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 21;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__HASH_PARTITIONING = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 22;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__UNION_PARTITIONING = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 23;
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__PARTITIONED = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 24;
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__CASCADE_ON_DELETE = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 25;
-	/**
-	 * The feature id for the '<em><b>Noncacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__NONCACHEABLE = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 26;
-	/**
-	 * The feature id for the '<em><b>Composite Member</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 27;
-	/**
-	 * The feature id for the '<em><b>Delete All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION__DELETE_ALL = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 28;
-	/**
-	 * The number of structural features of the '<em>Xml Element Collection</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_FEATURE_COUNT = OrmPackage.XML_ELEMENT_COLLECTION_FEATURE_COUNT + 29;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDABLE = 27;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__ACCESS = OrmPackage.XML_EMBEDDABLE__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__CLASS_NAME = OrmPackage.XML_EMBEDDABLE__CLASS_NAME;
-	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__METADATA_COMPLETE = OrmPackage.XML_EMBEDDABLE__METADATA_COMPLETE;
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__DESCRIPTION = OrmPackage.XML_EMBEDDABLE__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__ATTRIBUTES = OrmPackage.XML_EMBEDDABLE__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__ACCESS_METHODS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__ASSOCIATION_OVERRIDES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__PARENT_CLASS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__PLSQL_RECORDS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__PLSQL_TABLES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Struct</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__STRUCT = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Customizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__CUSTOMIZER = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__CHANGE_TRACKING = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__STRUCT_CONVERTERS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__PROPERTIES = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__CLONE_COPY_POLICY = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 16;
-	/**
-	 * The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 17;
-	/**
-	 * The number of structural features of the '<em>Xml Embeddable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_FEATURE_COUNT = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 18;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED = 28;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED__ACCESS = OrmPackage.XML_EMBEDDED__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED__NAME = OrmPackage.XML_EMBEDDED__NAME;
-	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED__ATTRIBUTE_OVERRIDES = OrmPackage.XML_EMBEDDED__ATTRIBUTE_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED__ASSOCIATION_OVERRIDES = OrmPackage.XML_EMBEDDED__ASSOCIATION_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED__ATTRIBUTE_TYPE = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED__PROPERTIES = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 2;
-	/**
-	 * The number of structural features of the '<em>Xml Embedded</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 3;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_ID = 29;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID__ACCESS = OrmPackage.XML_EMBEDDED_ID__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID__NAME = OrmPackage.XML_EMBEDDED_ID__NAME;
-	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID__ATTRIBUTE_OVERRIDES = OrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID__ATTRIBUTE_TYPE = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID__ACCESS_METHODS = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID__PROPERTIES = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 2;
-	/**
-	 * The number of structural features of the '<em>Xml Embedded Id</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 3;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity()
-	 * @generated
-	 */
-	public static final int XML_ENTITY = 30;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ACCESS = OrmPackage.XML_ENTITY__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CLASS_NAME = OrmPackage.XML_ENTITY__CLASS_NAME;
-	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__METADATA_COMPLETE = OrmPackage.XML_ENTITY__METADATA_COMPLETE;
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__DESCRIPTION = OrmPackage.XML_ENTITY__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ATTRIBUTES = OrmPackage.XML_ENTITY__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__NAMED_QUERIES = OrmPackage.XML_ENTITY__NAMED_QUERIES;
-	/**
-	 * The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__NAMED_NATIVE_QUERIES = OrmPackage.XML_ENTITY__NAMED_NATIVE_QUERIES;
-	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__SEQUENCE_GENERATOR = OrmPackage.XML_ENTITY__SEQUENCE_GENERATOR;
-	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__TABLE_GENERATOR = OrmPackage.XML_ENTITY__TABLE_GENERATOR;
-	/**
-	 * The feature id for the '<em><b>Pre Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PRE_PERSIST = OrmPackage.XML_ENTITY__PRE_PERSIST;
-	/**
-	 * The feature id for the '<em><b>Post Persist</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__POST_PERSIST = OrmPackage.XML_ENTITY__POST_PERSIST;
-	/**
-	 * The feature id for the '<em><b>Pre Remove</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PRE_REMOVE = OrmPackage.XML_ENTITY__PRE_REMOVE;
-	/**
-	 * The feature id for the '<em><b>Post Remove</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__POST_REMOVE = OrmPackage.XML_ENTITY__POST_REMOVE;
-	/**
-	 * The feature id for the '<em><b>Pre Update</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PRE_UPDATE = OrmPackage.XML_ENTITY__PRE_UPDATE;
-	/**
-	 * The feature id for the '<em><b>Post Update</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__POST_UPDATE = OrmPackage.XML_ENTITY__POST_UPDATE;
-	/**
-	 * The feature id for the '<em><b>Post Load</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__POST_LOAD = OrmPackage.XML_ENTITY__POST_LOAD;
-	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ATTRIBUTE_OVERRIDES = OrmPackage.XML_ENTITY__ATTRIBUTE_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ASSOCIATION_OVERRIDES = OrmPackage.XML_ENTITY__ASSOCIATION_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CACHEABLE = OrmPackage.XML_ENTITY__CACHEABLE;
-	/**
-	 * The feature id for the '<em><b>Id Class</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ID_CLASS = OrmPackage.XML_ENTITY__ID_CLASS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__NAME = OrmPackage.XML_ENTITY__NAME;
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__TABLE = OrmPackage.XML_ENTITY__TABLE;
-	/**
-	 * The feature id for the '<em><b>Secondary Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__SECONDARY_TABLES = OrmPackage.XML_ENTITY__SECONDARY_TABLES;
-	/**
-	 * The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS = OrmPackage.XML_ENTITY__PRIMARY_KEY_JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Inheritance</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__INHERITANCE = OrmPackage.XML_ENTITY__INHERITANCE;
-	/**
-	 * The feature id for the '<em><b>Discriminator Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__DISCRIMINATOR_VALUE = OrmPackage.XML_ENTITY__DISCRIMINATOR_VALUE;
-	/**
-	 * The feature id for the '<em><b>Discriminator Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__DISCRIMINATOR_COLUMN = OrmPackage.XML_ENTITY__DISCRIMINATOR_COLUMN;
-	/**
-	 * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_ENTITY__SQL_RESULT_SET_MAPPINGS;
-	/**
-	 * The feature id for the '<em><b>Exclude Default Listeners</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS = OrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_LISTENERS;
-	/**
-	 * The feature id for the '<em><b>Exclude Superclass Listeners</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS = OrmPackage.XML_ENTITY__EXCLUDE_SUPERCLASS_LISTENERS;
-	/**
-	 * The feature id for the '<em><b>Entity Listeners</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ENTITY_LISTENERS = OrmPackage.XML_ENTITY__ENTITY_LISTENERS;
-	/**
-	 * The feature id for the '<em><b>Primary Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PRIMARY_KEY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CACHE_INTERCEPTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__QUERY_REDIRECTORS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ACCESS_METHODS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__FETCH_GROUPS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Class Extractor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CLASS_EXTRACTOR = OrmPackage.XML_ENTITY_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PARENT_CLASS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PARTITIONING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__REPLICATION_PARTITIONING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ROUND_ROBIN_PARTITIONING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PINNED_PARTITIONING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__RANGE_PARTITIONING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__VALUE_PARTITIONING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__HASH_PARTITIONING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__UNION_PARTITIONING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PARTITIONED = OrmPackage.XML_ENTITY_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Additional Criteria</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__ADDITIONAL_CRITERIA = OrmPackage.XML_ENTITY_FEATURE_COUNT + 16;
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CASCADE_ON_DELETE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 17;
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__INDEX = OrmPackage.XML_ENTITY_FEATURE_COUNT + 18;
-	/**
-	 * The feature id for the '<em><b>Multitenant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__MULTITENANT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 19;
-	/**
-	 * The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 20;
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 21;
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 22;
-	/**
-	 * The feature id for the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PLSQL_RECORDS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 23;
-	/**
-	 * The feature id for the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PLSQL_TABLES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 24;
-	/**
-	 * The feature id for the '<em><b>Struct</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__STRUCT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 25;
-	/**
-	 * The feature id for the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CACHE_INDEX = OrmPackage.XML_ENTITY_FEATURE_COUNT + 26;
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__READ_ONLY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 27;
-	/**
-	 * The feature id for the '<em><b>Customizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CUSTOMIZER = OrmPackage.XML_ENTITY_FEATURE_COUNT + 28;
-	/**
-	 * The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CHANGE_TRACKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 29;
-	/**
-	 * The feature id for the '<em><b>Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CACHE = OrmPackage.XML_ENTITY_FEATURE_COUNT + 30;
-	/**
-	 * The feature id for the '<em><b>Existence Checking</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__EXISTENCE_CHECKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 31;
-	/**
-	 * The feature id for the '<em><b>Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 32;
-	/**
-	 * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 33;
-	/**
-	 * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 34;
-	/**
-	 * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 35;
-	/**
-	 * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 36;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__PROPERTIES = OrmPackage.XML_ENTITY_FEATURE_COUNT + 37;
-	/**
-	 * The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__OPTIMISTIC_LOCKING = OrmPackage.XML_ENTITY_FEATURE_COUNT + 38;
-	/**
-	 * The feature id for the '<em><b>Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 39;
-	/**
-	 * The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__INSTANTIATION_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 40;
-	/**
-	 * The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__CLONE_COPY_POLICY = OrmPackage.XML_ENTITY_FEATURE_COUNT + 41;
-	/**
-	 * The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_ENTITY_FEATURE_COUNT + 42;
-	/**
-	 * The number of structural features of the '<em>Xml Entity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 43;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_MAPPINGS = 31;
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__VERSION = OrmPackage.XML_ENTITY_MAPPINGS__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 XML_ENTITY_MAPPINGS__SCHEMA_LOCATION = OrmPackage.XML_ENTITY_MAPPINGS__SCHEMA_LOCATION;
-	/**
-	 * The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__NAMED_QUERIES = OrmPackage.XML_ENTITY_MAPPINGS__NAMED_QUERIES;
-	/**
-	 * The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES = OrmPackage.XML_ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__ACCESS = OrmPackage.XML_ENTITY_MAPPINGS__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__DESCRIPTION = OrmPackage.XML_ENTITY_MAPPINGS__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Metadata</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA = OrmPackage.XML_ENTITY_MAPPINGS__PERSISTENCE_UNIT_METADATA;
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__PACKAGE = OrmPackage.XML_ENTITY_MAPPINGS__PACKAGE;
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__SCHEMA = OrmPackage.XML_ENTITY_MAPPINGS__SCHEMA;
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__CATALOG = OrmPackage.XML_ENTITY_MAPPINGS__CATALOG;
-	/**
-	 * The feature id for the '<em><b>Sequence Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS = OrmPackage.XML_ENTITY_MAPPINGS__SEQUENCE_GENERATORS;
-	/**
-	 * The feature id for the '<em><b>Table Generators</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__TABLE_GENERATORS = OrmPackage.XML_ENTITY_MAPPINGS__TABLE_GENERATORS;
-	/**
-	 * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS;
-	/**
-	 * The feature id for the '<em><b>Mapped Superclasses</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES = OrmPackage.XML_ENTITY_MAPPINGS__MAPPED_SUPERCLASSES;
-	/**
-	 * The feature id for the '<em><b>Entities</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__ENTITIES = OrmPackage.XML_ENTITY_MAPPINGS__ENTITIES;
-	/**
-	 * The feature id for the '<em><b>Embeddables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__EMBEDDABLES = OrmPackage.XML_ENTITY_MAPPINGS__EMBEDDABLES;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__ACCESS_METHODS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__PINNED_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__RANGE_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__VALUE_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__HASH_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__UNION_PARTITIONING = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__PLSQL_RECORDS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__PLSQL_TABLES = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__TYPE_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 16;
-	/**
-	 * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 17;
-	/**
-	 * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 18;
-	/**
-	 * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 19;
-	/**
-	 * The number of structural features of the '<em>Xml Entity Mappings</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 20;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute <em>Xml Fetch Attribute</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute()
-	 * @generated
-	 */
-	public static final int XML_FETCH_ATTRIBUTE = 32;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_ATTRIBUTE__NAME = EclipseLinkOrmV2_1Package.XML_FETCH_ATTRIBUTE_21__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Fetch Attribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_ATTRIBUTE_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_FETCH_ATTRIBUTE_21_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup <em>Xml Fetch Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup()
-	 * @generated
-	 */
-	public static final int XML_FETCH_GROUP = 33;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP__NAME = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21__NAME;
-	/**
-	 * The feature id for the '<em><b>Load</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP__LOAD = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21__LOAD;
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP__ATTRIBUTES = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21__ATTRIBUTES;
-	/**
-	 * The number of structural features of the '<em>Xml Fetch Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_21_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId()
-	 * @generated
-	 */
-	public static final int XML_ID = 35;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex <em>Xml Index</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex()
-	 * @generated
-	 */
-	public static final int XML_INDEX = 36;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlInstantiationCopyPolicy <em>Xml Instantiation Copy Policy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlInstantiationCopyPolicy
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationCopyPolicy()
-	 * @generated
-	 */
-	public static final int XML_INSTANTIATION_COPY_POLICY = 37;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch <em>Xml Join Fetch</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch()
-	 * @generated
-	 */
-	public static final int XML_JOIN_FETCH = 38;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinTable()
-	 * @generated
-	 */
-	public static final int XML_JOIN_TABLE = 39;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY = 40;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE = 41;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS = 42;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable()
-	 * @generated
-	 */
-	public static final int XML_MUTABLE = 44;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery <em>Xml Named Stored Procedure Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY = 49;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
-	 * @generated
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER = 50;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY = 51;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE = 52;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking <em>Xml Optimistic Locking</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking()
-	 * @generated
-	 */
-	public static final int XML_OPTIMISTIC_LOCKING = 53;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOrderColumn
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOrderColumn()
-	 * @generated
-	 */
-	public static final int XML_ORDER_COLUMN = 54;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 56;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA = 57;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey <em>Xml Primary Key</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey()
-	 * @generated
-	 */
-	public static final int XML_PRIMARY_KEY = 61;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned <em>Xml Private Owned</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned()
-	 * @generated
-	 */
-	public static final int XML_PRIVATE_OWNED = 62;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty <em>Xml Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty()
-	 * @generated
-	 */
-	public static final int XML_PROPERTY = 63;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer <em>Xml Property Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer()
-	 * @generated
-	 */
-	public static final int XML_PROPERTY_CONTAINER = 64;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer <em>Xml Query Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer()
-	 * @generated
-	 */
-	public static final int XML_QUERY_CONTAINER = 65;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors <em>Xml Query Redirectors</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors()
-	 * @generated
-	 */
-	public static final int XML_QUERY_REDIRECTORS = 66;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly <em>Xml Read Only</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly()
-	 * @generated
-	 */
-	public static final int XML_READ_ONLY = 68;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert <em>Xml Return Insert</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert()
-	 * @generated
-	 */
-	public static final int XML_RETURN_INSERT = 70;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlSecondaryTable
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlSecondaryTable()
-	 * @generated
-	 */
-	public static final int XML_SECONDARY_TABLE = 72;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter()
-	 * @generated
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER = 73;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter <em>Xml Struct Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
-	 * @generated
-	 */
-	public static final int XML_STRUCT_CONVERTER = 75;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTable
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTable()
-	 * @generated
-	 */
-	public static final int XML_TABLE = 77;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTableGenerator()
-	 * @generated
-	 */
-	public static final int XML_TABLE_GENERATOR = 78;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay <em>Xml Time Of Day</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay()
-	 * @generated
-	 */
-	public static final int XML_TIME_OF_DAY = 80;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation()
-	 * @generated
-	 */
-	public static final int XML_TRANSFORMATION = 81;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransient
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransient()
-	 * @generated
-	 */
-	public static final int XML_TRANSIENT = 82;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
-	 * @generated
-	 */
-	public static final int XML_TYPE_CONVERTER = 83;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne()
-	 * @generated
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE = 86;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion()
-	 * @generated
-	 */
-	public static final int XML_VERSION = 87;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning <em>Xml Hash Partitioning</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlHashPartitioning()
-	 * @generated
-	 */
-	public static final int XML_HASH_PARTITIONING = 34;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_HASH_PARTITIONING__NAME = EclipseLinkOrmV2_2Package.XML_HASH_PARTITIONING_22__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Hash Partitioning</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_HASH_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_HASH_PARTITIONING_22_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__ACCESS = OrmPackage.XML_ID__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__NAME = OrmPackage.XML_ID__NAME;
-	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__COLUMN = OrmPackage.XML_ID__COLUMN;
-	/**
-	 * The feature id for the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__LOB = OrmPackage.XML_ID__LOB;
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__TEMPORAL = OrmPackage.XML_ID__TEMPORAL;
-	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__ENUMERATED = OrmPackage.XML_ID__ENUMERATED;
-	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__SEQUENCE_GENERATOR = OrmPackage.XML_ID__SEQUENCE_GENERATOR;
-	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__TABLE_GENERATOR = OrmPackage.XML_ID__TABLE_GENERATOR;
-	/**
-	 * The feature id for the '<em><b>Generated Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__GENERATED_VALUE = OrmPackage.XML_ID__GENERATED_VALUE;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__ATTRIBUTE_TYPE = OrmPackage.XML_ID_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__INDEX = OrmPackage.XML_ID_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__CACHE_INDEX = OrmPackage.XML_ID_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__ACCESS_METHODS = OrmPackage.XML_ID_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__PROPERTIES = OrmPackage.XML_ID_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__MUTABLE = OrmPackage.XML_ID_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__STRUCT_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID__CONVERT = OrmPackage.XML_ID_FEATURE_COUNT + 10;
-	/**
-	 * The number of structural features of the '<em>Xml Id</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_FEATURE_COUNT = OrmPackage.XML_ID_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX__NAME = EclipseLinkOrmV2_2Package.XML_INDEX_22__NAME;
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX__SCHEMA = EclipseLinkOrmV2_2Package.XML_INDEX_22__SCHEMA;
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX__CATALOG = EclipseLinkOrmV2_2Package.XML_INDEX_22__CATALOG;
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX__TABLE = EclipseLinkOrmV2_2Package.XML_INDEX_22__TABLE;
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX__UNIQUE = EclipseLinkOrmV2_2Package.XML_INDEX_22__UNIQUE;
-	/**
-	 * The feature id for the '<em><b>Column Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX__COLUMN_NAMES = EclipseLinkOrmV2_2Package.XML_INDEX_22__COLUMN_NAMES;
-	/**
-	 * The number of structural features of the '<em>Xml Index</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_INDEX_22_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Instantiation Copy Policy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INSTANTIATION_COPY_POLICY_FEATURE_COUNT = 0;
-	/**
-	 * The feature id for the '<em><b>Join Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_FETCH__JOIN_FETCH = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Join Fetch</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_FETCH_FEATURE_COUNT = 1;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__NAME = OrmPackage.XML_JOIN_TABLE__NAME;
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__CATALOG = OrmPackage.XML_JOIN_TABLE__CATALOG;
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__SCHEMA = OrmPackage.XML_JOIN_TABLE__SCHEMA;
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__UNIQUE_CONSTRAINTS = OrmPackage.XML_JOIN_TABLE__UNIQUE_CONSTRAINTS;
-	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__JOIN_COLUMNS = OrmPackage.XML_JOIN_TABLE__JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Inverse Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS = OrmPackage.XML_JOIN_TABLE__INVERSE_JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE__CREATION_SUFFIX = OrmPackage.XML_JOIN_TABLE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Join Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_FEATURE_COUNT = OrmPackage.XML_JOIN_TABLE_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__ACCESS = OrmPackage.XML_MANY_TO_MANY__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__NAME = OrmPackage.XML_MANY_TO_MANY__NAME;
-	/**
-	 * The feature id for the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__TARGET_ENTITY = OrmPackage.XML_MANY_TO_MANY__TARGET_ENTITY;
-	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__FETCH = OrmPackage.XML_MANY_TO_MANY__FETCH;
-	/**
-	 * The feature id for the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__CASCADE = OrmPackage.XML_MANY_TO_MANY__CASCADE;
-	/**
-	 * The feature id for the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAPPED_BY = OrmPackage.XML_MANY_TO_MANY__MAPPED_BY;
-	/**
-	 * The feature id for the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__JOIN_TABLE = OrmPackage.XML_MANY_TO_MANY__JOIN_TABLE;
-	/**
-	 * The feature id for the '<em><b>Order Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__ORDER_COLUMN = OrmPackage.XML_MANY_TO_MANY__ORDER_COLUMN;
-	/**
-	 * The feature id for the '<em><b>Order By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__ORDER_BY = OrmPackage.XML_MANY_TO_MANY__ORDER_BY;
-	/**
-	 * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY_TEMPORAL = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_TEMPORAL;
-	/**
-	 * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY_ENUMERATED = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_ENUMERATED;
-	/**
-	 * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY_CLASS = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_CLASS;
-	/**
-	 * The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY_COLUMN = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_COLUMN;
-	/**
-	 * The feature id for the '<em><b>Map Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY_JOIN_COLUMNS = OrmPackage.XML_MANY_TO_MANY__MAP_KEY_JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY = OrmPackage.XML_MANY_TO_MANY__MAP_KEY;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__TYPE_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__STRUCT_CONVERTER = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__BATCH_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__ATTRIBUTE_TYPE = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__PARTITIONING = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__REPLICATION_PARTITIONING = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__PINNED_PARTITIONING = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__RANGE_PARTITIONING = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__VALUE_PARTITIONING = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__HASH_PARTITIONING = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__UNION_PARTITIONING = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__PARTITIONED = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 16;
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__CASCADE_ON_DELETE = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 17;
-	/**
-	 * The feature id for the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__NON_CACHEABLE = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 18;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__ACCESS_METHODS = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 19;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__PROPERTIES = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 20;
-	/**
-	 * The feature id for the '<em><b>Join Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY__JOIN_FETCH = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 21;
-	/**
-	 * The number of structural features of the '<em>Xml Many To Many</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_FEATURE_COUNT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 22;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__ACCESS = OrmPackage.XML_MANY_TO_ONE__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__NAME = OrmPackage.XML_MANY_TO_ONE__NAME;
-	/**
-	 * The feature id for the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__TARGET_ENTITY = OrmPackage.XML_MANY_TO_ONE__TARGET_ENTITY;
-	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__FETCH = OrmPackage.XML_MANY_TO_ONE__FETCH;
-	/**
-	 * The feature id for the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__CASCADE = OrmPackage.XML_MANY_TO_ONE__CASCADE;
-	/**
-	 * The feature id for the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__JOIN_TABLE = OrmPackage.XML_MANY_TO_ONE__JOIN_TABLE;
-	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__JOIN_COLUMNS = OrmPackage.XML_MANY_TO_ONE__JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__ID = OrmPackage.XML_MANY_TO_ONE__ID;
-	/**
-	 * The feature id for the '<em><b>Maps Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__MAPS_ID = OrmPackage.XML_MANY_TO_ONE__MAPS_ID;
-	/**
-	 * The feature id for the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__OPTIONAL = OrmPackage.XML_MANY_TO_ONE__OPTIONAL;
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__BATCH_FETCH = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__PARTITIONING = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__REPLICATION_PARTITIONING = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__PINNED_PARTITIONING = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__RANGE_PARTITIONING = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__VALUE_PARTITIONING = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__HASH_PARTITIONING = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__UNION_PARTITIONING = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__PARTITIONED = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__NON_CACHEABLE = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__ACCESS_METHODS = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__PROPERTIES = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Join Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE__JOIN_FETCH = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 13;
-	/**
-	 * The number of structural features of the '<em>Xml Many To One</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_FEATURE_COUNT = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ACCESS = OrmPackage.XML_MAPPED_SUPERCLASS__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CLASS_NAME = OrmPackage.XML_MAPPED_SUPERCLASS__CLASS_NAME;
-	/**
-	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__METADATA_COMPLETE = OrmPackage.XML_MAPPED_SUPERCLASS__METADATA_COMPLETE;
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__DESCRIPTION = OrmPackage.XML_MAPPED_SUPERCLASS__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ATTRIBUTES = OrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Id Class</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ID_CLASS = OrmPackage.XML_MAPPED_SUPERCLASS__ID_CLASS;
-	/**
-	 * The feature id for the '<em><b>Exclude Default Listeners</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS = OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_LISTENERS;
-	/**
-	 * The feature id for the '<em><b>Exclude Superclass Listeners</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS = OrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_SUPERCLASS_LISTENERS;
-	/**
-	 * The feature id for the '<em><b>Entity Listeners</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS = OrmPackage.XML_MAPPED_SUPERCLASS__ENTITY_LISTENERS;
-	/**
-	 * The feature id for the '<em><b>Primary Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PRIMARY_KEY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CACHEABLE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__FETCH_GROUPS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__TABLE_GENERATOR = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__NAMED_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ACCESS_METHODS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PARENT_CLASS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PARTITIONING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 16;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 17;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 18;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 19;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 20;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__HASH_PARTITIONING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 21;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__UNION_PARTITIONING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 22;
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PARTITIONED = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 23;
-	/**
-	 * The feature id for the '<em><b>Additional Criteria</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 24;
-	/**
-	 * The feature id for the '<em><b>Multitenant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__MULTITENANT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 25;
-	/**
-	 * The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 26;
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 27;
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 28;
-	/**
-	 * The feature id for the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PLSQL_RECORDS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 29;
-	/**
-	 * The feature id for the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PLSQL_TABLES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 30;
-	/**
-	 * The feature id for the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CACHE_INDEX = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 31;
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__READ_ONLY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 32;
-	/**
-	 * The feature id for the '<em><b>Customizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CUSTOMIZER = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 33;
-	/**
-	 * The feature id for the '<em><b>Change Tracking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CHANGE_TRACKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 34;
-	/**
-	 * The feature id for the '<em><b>Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CACHE = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 35;
-	/**
-	 * The feature id for the '<em><b>Existence Checking</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 36;
-	/**
-	 * The feature id for the '<em><b>Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 37;
-	/**
-	 * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 38;
-	/**
-	 * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 39;
-	/**
-	 * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 40;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__PROPERTIES = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 41;
-	/**
-	 * The feature id for the '<em><b>Optimistic Locking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 42;
-	/**
-	 * The feature id for the '<em><b>Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 43;
-	/**
-	 * The feature id for the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 44;
-	/**
-	 * The feature id for the '<em><b>Clone Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 45;
-	/**
-	 * The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 46;
-	/**
-	 * The number of structural features of the '<em>Xml Mapped Superclass</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 47;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant <em>Xml Multitenant</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant()
-	 * @generated
-	 */
-	public static final int XML_MULTITENANT = 43;
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT__TYPE = EclipseLinkOrmV2_3Package.XML_MULTITENANT_23__TYPE;
-	/**
-	 * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS = EclipseLinkOrmV2_3Package.XML_MULTITENANT_23__TENANT_DISCRIMINATOR_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Include Criteria</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT__INCLUDE_CRITERIA = EclipseLinkOrmV2_3Package.XML_MULTITENANT_23_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Multitenant</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_MULTITENANT_23_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MUTABLE__MUTABLE = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Mutable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MUTABLE_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery <em>Xml Named Plsql Stored Function Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredFunctionQuery()
-	 * @generated
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_FUNCTION_QUERY = 46;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME = EclipseLinkOrmV2_3Package.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Named Plsql Stored Function Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery <em>Xml Named Plsql Stored Procedure Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredProcedureQuery()
-	 * @generated
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY = 47;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME = EclipseLinkOrmV2_3Package.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Named Plsql Stored Procedure Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery <em>Xml Named Stored Function Query</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredFunctionQuery()
-	 * @generated
-	 */
-	public static final int XML_NAMED_STORED_FUNCTION_QUERY = 48;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_FUNCTION_QUERY__NAME = EclipseLinkOrmV2_3Package.XML_NAMED_STORED_FUNCTION_QUERY_23__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Named Stored Function Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_FUNCTION_QUERY_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_NAMED_STORED_FUNCTION_QUERY_23_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__NAME = 0;
-	/**
-	 * The feature id for the '<em><b>Result Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS = 1;
-	/**
-	 * The feature id for the '<em><b>Result Set Mapping</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING = 2;
-	/**
-	 * The feature id for the '<em><b>Procedure Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = 3;
-	/**
-	 * The feature id for the '<em><b>Returns Result Set</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET = 4;
-	/**
-	 * The feature id for the '<em><b>Hints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = 5;
-	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = 6;
-	/**
-	 * The number of structural features of the '<em>Xml Named Stored Procedure Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_PROCEDURE_QUERY_FEATURE_COUNT = 7;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER__NAME = XML_NAMED_CONVERTER__NAME;
-	/**
-	 * The feature id for the '<em><b>Data Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER__DATA_TYPE = XML_NAMED_CONVERTER_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Object Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE = XML_NAMED_CONVERTER_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Conversion Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES = XML_NAMED_CONVERTER_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Default Object Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE = XML_NAMED_CONVERTER_FEATURE_COUNT + 3;
-	/**
-	 * The number of structural features of the '<em>Xml Object Type Converter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER_FEATURE_COUNT = XML_NAMED_CONVERTER_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__ACCESS = OrmPackage.XML_ONE_TO_MANY__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__NAME = OrmPackage.XML_ONE_TO_MANY__NAME;
-	/**
-	 * The feature id for the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__TARGET_ENTITY = OrmPackage.XML_ONE_TO_MANY__TARGET_ENTITY;
-	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__FETCH = OrmPackage.XML_ONE_TO_MANY__FETCH;
-	/**
-	 * The feature id for the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__CASCADE = OrmPackage.XML_ONE_TO_MANY__CASCADE;
-	/**
-	 * The feature id for the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAPPED_BY = OrmPackage.XML_ONE_TO_MANY__MAPPED_BY;
-	/**
-	 * The feature id for the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__JOIN_TABLE = OrmPackage.XML_ONE_TO_MANY__JOIN_TABLE;
-	/**
-	 * The feature id for the '<em><b>Order Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__ORDER_COLUMN = OrmPackage.XML_ONE_TO_MANY__ORDER_COLUMN;
-	/**
-	 * The feature id for the '<em><b>Order By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__ORDER_BY = OrmPackage.XML_ONE_TO_MANY__ORDER_BY;
-	/**
-	 * The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_ATTRIBUTE_OVERRIDES;
-	/**
-	 * The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY_TEMPORAL = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_TEMPORAL;
-	/**
-	 * The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY_ENUMERATED = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_ENUMERATED;
-	/**
-	 * The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY_CLASS = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_CLASS;
-	/**
-	 * The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY_COLUMN = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_COLUMN;
-	/**
-	 * The feature id for the '<em><b>Map Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY_JOIN_COLUMNS = OrmPackage.XML_ONE_TO_MANY__MAP_KEY_JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Map Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY = OrmPackage.XML_ONE_TO_MANY__MAP_KEY;
-	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__JOIN_COLUMNS = OrmPackage.XML_ONE_TO_MANY__JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Orphan Removal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__ORPHAN_REMOVAL = OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__TYPE_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__STRUCT_CONVERTER = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__MAP_KEY_CONVERT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__BATCH_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__ATTRIBUTE_TYPE = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__PARTITIONING = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__REPLICATION_PARTITIONING = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__PINNED_PARTITIONING = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__RANGE_PARTITIONING = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__VALUE_PARTITIONING = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__HASH_PARTITIONING = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__UNION_PARTITIONING = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__PARTITIONED = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 16;
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__CASCADE_ON_DELETE = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 17;
-	/**
-	 * The feature id for the '<em><b>Noncacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__NONCACHEABLE = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 18;
-	/**
-	 * The feature id for the '<em><b>Delete All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__DELETE_ALL = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 19;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__ACCESS_METHODS = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 20;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__PROPERTIES = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 21;
-	/**
-	 * The feature id for the '<em><b>Private Owned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 22;
-	/**
-	 * The feature id for the '<em><b>Join Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY__JOIN_FETCH = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 23;
-	/**
-	 * The number of structural features of the '<em>Xml One To Many</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_FEATURE_COUNT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 24;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__ACCESS = OrmPackage.XML_ONE_TO_ONE__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__NAME = OrmPackage.XML_ONE_TO_ONE__NAME;
-	/**
-	 * The feature id for the '<em><b>Target Entity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__TARGET_ENTITY = OrmPackage.XML_ONE_TO_ONE__TARGET_ENTITY;
-	/**
-	 * The feature id for the '<em><b>Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__FETCH = OrmPackage.XML_ONE_TO_ONE__FETCH;
-	/**
-	 * The feature id for the '<em><b>Cascade</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__CASCADE = OrmPackage.XML_ONE_TO_ONE__CASCADE;
-	/**
-	 * The feature id for the '<em><b>Join Table</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__JOIN_TABLE = OrmPackage.XML_ONE_TO_ONE__JOIN_TABLE;
-	/**
-	 * The feature id for the '<em><b>Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__JOIN_COLUMNS = OrmPackage.XML_ONE_TO_ONE__JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__ID = OrmPackage.XML_ONE_TO_ONE__ID;
-	/**
-	 * The feature id for the '<em><b>Maps Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__MAPS_ID = OrmPackage.XML_ONE_TO_ONE__MAPS_ID;
-	/**
-	 * The feature id for the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__OPTIONAL = OrmPackage.XML_ONE_TO_ONE__OPTIONAL;
-	/**
-	 * The feature id for the '<em><b>Mapped By</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__MAPPED_BY = OrmPackage.XML_ONE_TO_ONE__MAPPED_BY;
-	/**
-	 * The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS = OrmPackage.XML_ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Orphan Removal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__ORPHAN_REMOVAL = OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL;
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__BATCH_FETCH = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__PARTITIONING = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__REPLICATION_PARTITIONING = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__PINNED_PARTITIONING = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__RANGE_PARTITIONING = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__VALUE_PARTITIONING = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__HASH_PARTITIONING = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__UNION_PARTITIONING = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__PARTITIONED = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__CASCADE_ON_DELETE = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__NON_CACHEABLE = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 11;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__ACCESS_METHODS = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__PROPERTIES = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 13;
-	/**
-	 * The feature id for the '<em><b>Private Owned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__PRIVATE_OWNED = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 14;
-	/**
-	 * The feature id for the '<em><b>Join Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE__JOIN_FETCH = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 15;
-	/**
-	 * The number of structural features of the '<em>Xml One To One</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_FEATURE_COUNT = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 16;
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OPTIMISTIC_LOCKING__TYPE = 0;
-	/**
-	 * The feature id for the '<em><b>Cascade</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OPTIMISTIC_LOCKING__CASCADE = 1;
-	/**
-	 * The feature id for the '<em><b>Selected Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS = 2;
-	/**
-	 * The number of structural features of the '<em>Xml Optimistic Locking</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_OPTIMISTIC_LOCKING_FEATURE_COUNT = 3;
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN__COLUMN_DEFINITION = OrmPackage.XML_ORDER_COLUMN__COLUMN_DEFINITION;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN__NAME = OrmPackage.XML_ORDER_COLUMN__NAME;
-	/**
-	 * The feature id for the '<em><b>Nullable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN__NULLABLE = OrmPackage.XML_ORDER_COLUMN__NULLABLE;
-	/**
-	 * The feature id for the '<em><b>Insertable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN__INSERTABLE = OrmPackage.XML_ORDER_COLUMN__INSERTABLE;
-	/**
-	 * The feature id for the '<em><b>Updatable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN__UPDATABLE = OrmPackage.XML_ORDER_COLUMN__UPDATABLE;
-	/**
-	 * The feature id for the '<em><b>Correction Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN__CORRECTION_TYPE = OrmPackage.XML_ORDER_COLUMN_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Order Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN_FEATURE_COUNT = OrmPackage.XML_ORDER_COLUMN_FEATURE_COUNT + 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning <em>Xml Partitioning</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioning()
-	 * @generated
-	 */
-	public static final int XML_PARTITIONING = 55;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING__NAME = EclipseLinkOrmV2_2Package.XML_PARTITIONING_22__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Partitioning</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_PARTITIONING_22_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__DESCRIPTION = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Delimited Identifiers</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__DELIMITED_IDENTIFIERS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__DELIMITED_IDENTIFIERS;
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__SCHEMA;
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CATALOG;
-	/**
-	 * The feature id for the '<em><b>Cascade Persist</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__CASCADE_PERSIST;
-	/**
-	 * The feature id for the '<em><b>Entity Listeners</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Xml Persistence Unit Defaults</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA__DESCRIPTION = OrmPackage.XML_PERSISTENCE_UNIT_METADATA__DESCRIPTION;
-	/**
-	 * 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 XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE = OrmPackage.XML_PERSISTENCE_UNIT_METADATA__XML_MAPPING_METADATA_COMPLETE;
-	/**
-	 * The feature id for the '<em><b>Persistence Unit Defaults</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS = OrmPackage.XML_PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS;
-	/**
-	 * The feature id for the '<em><b>Exclude Default Mappings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS = OrmPackage.XML_PERSISTENCE_UNIT_METADATA_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Persistence Unit Metadata</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_METADATA_FEATURE_COUNT = OrmPackage.XML_PERSISTENCE_UNIT_METADATA_FEATURE_COUNT + 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning <em>Xml Pinned Partitioning</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPinnedPartitioning()
-	 * @generated
-	 */
-	public static final int XML_PINNED_PARTITIONING = 58;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PINNED_PARTITIONING__NAME = EclipseLinkOrmV2_2Package.XML_PINNED_PARTITIONING_22__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Pinned Partitioning</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PINNED_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_PINNED_PARTITIONING_22_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord <em>Xml Plsql Record</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlRecord()
-	 * @generated
-	 */
-	public static final int XML_PLSQL_RECORD = 59;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PLSQL_RECORD__NAME = EclipseLinkOrmV2_3Package.XML_PLSQL_RECORD_23__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Plsql Record</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PLSQL_RECORD_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_PLSQL_RECORD_23_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable <em>Xml Plsql Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlTable()
-	 * @generated
-	 */
-	public static final int XML_PLSQL_TABLE = 60;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PLSQL_TABLE__NAME = EclipseLinkOrmV2_3Package.XML_PLSQL_TABLE_23__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Plsql Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PLSQL_TABLE_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_PLSQL_TABLE_23_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Validation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY__VALIDATION = EclipseLinkOrmV1_1Package.XML_PRIMARY_KEY_11__VALIDATION;
-	/**
-	 * The feature id for the '<em><b>Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY__COLUMNS = EclipseLinkOrmV1_1Package.XML_PRIMARY_KEY_11__COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Cache Key Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY__CACHE_KEY_TYPE = EclipseLinkOrmV1_1Package.XML_PRIMARY_KEY_11_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Primary Key</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_FEATURE_COUNT = EclipseLinkOrmV1_1Package.XML_PRIMARY_KEY_11_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Private Owned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIVATE_OWNED__PRIVATE_OWNED = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Private Owned</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIVATE_OWNED_FEATURE_COUNT = 1;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_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 XML_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 XML_PROPERTY__VALUE_TYPE = 2;
-	/**
-	 * The number of structural features of the '<em>Xml Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PROPERTY_FEATURE_COUNT = 3;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PROPERTY_CONTAINER__PROPERTIES = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Property Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PROPERTY_CONTAINER_FEATURE_COUNT = 1;
-	/**
-	 * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Query Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_CONTAINER_FEATURE_COUNT = 1;
-	/**
-	 * The feature id for the '<em><b>All Queries</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS__ALL_QUERIES = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__ALL_QUERIES;
-	/**
-	 * The feature id for the '<em><b>Read All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS__READ_ALL = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__READ_ALL;
-	/**
-	 * The feature id for the '<em><b>Read Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS__READ_OBJECT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__READ_OBJECT;
-	/**
-	 * The feature id for the '<em><b>Report</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS__REPORT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__REPORT;
-	/**
-	 * The feature id for the '<em><b>Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS__UPDATE = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__UPDATE;
-	/**
-	 * The feature id for the '<em><b>Insert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS__INSERT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__INSERT;
-	/**
-	 * The feature id for the '<em><b>Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS__DELETE = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20__DELETE;
-	/**
-	 * The number of structural features of the '<em>Xml Query Redirectors</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_FEATURE_COUNT = EclipseLinkOrmV2_0Package.XML_QUERY_REDIRECTORS_20_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning <em>Xml Range Partitioning</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRangePartitioning()
-	 * @generated
-	 */
-	public static final int XML_RANGE_PARTITIONING = 67;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RANGE_PARTITIONING__NAME = EclipseLinkOrmV2_2Package.XML_RANGE_PARTITIONING_22__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Range Partitioning</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RANGE_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_RANGE_PARTITIONING_22_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_READ_ONLY__READ_ONLY = 0;
-	/**
-	 * The number of structural features of the '<em>Xml Read Only</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_READ_ONLY_FEATURE_COUNT = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning <em>Xml Replication Partitioning</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReplicationPartitioning()
-	 * @generated
-	 */
-	public static final int XML_REPLICATION_PARTITIONING = 69;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_REPLICATION_PARTITIONING__NAME = EclipseLinkOrmV2_2Package.XML_REPLICATION_PARTITIONING_22__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Replication Partitioning</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_REPLICATION_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_REPLICATION_PARTITIONING_22_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Return Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RETURN_INSERT__RETURN_ONLY = EclipseLinkOrmV2_1Package.XML_RETURN_INSERT_21__RETURN_ONLY;
-	/**
-	 * The number of structural features of the '<em>Xml Return Insert</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RETURN_INSERT_FEATURE_COUNT = EclipseLinkOrmV2_1Package.XML_RETURN_INSERT_21_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning <em>Xml Round Robin Partitioning</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRoundRobinPartitioning()
-	 * @generated
-	 */
-	public static final int XML_ROUND_ROBIN_PARTITIONING = 71;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ROUND_ROBIN_PARTITIONING__NAME = EclipseLinkOrmV2_2Package.XML_ROUND_ROBIN_PARTITIONING_22__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Round Robin Partitioning</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ROUND_ROBIN_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_ROUND_ROBIN_PARTITIONING_22_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__NAME = OrmPackage.XML_SECONDARY_TABLE__NAME;
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__CATALOG = OrmPackage.XML_SECONDARY_TABLE__CATALOG;
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__SCHEMA = OrmPackage.XML_SECONDARY_TABLE__SCHEMA;
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__UNIQUE_CONSTRAINTS = OrmPackage.XML_SECONDARY_TABLE__UNIQUE_CONSTRAINTS;
-	/**
-	 * The feature id for the '<em><b>Primary Key Join Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS = OrmPackage.XML_SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS;
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE__CREATION_SUFFIX = OrmPackage.XML_SECONDARY_TABLE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Secondary Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_FEATURE_COUNT = OrmPackage.XML_SECONDARY_TABLE_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Direction</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER__DIRECTION = 0;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER__NAME = 1;
-	/**
-	 * The feature id for the '<em><b>Query Parameter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER = 2;
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER__TYPE = 3;
-	/**
-	 * The feature id for the '<em><b>Jdbc Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE = 4;
-	/**
-	 * The feature id for the '<em><b>Jdbc Type Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE_NAME = 5;
-	/**
-	 * The number of structural features of the '<em>Xml Stored Procedure Parameter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STORED_PROCEDURE_PARAMETER_FEATURE_COUNT = 6;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStruct <em>Xml Struct</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStruct
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStruct()
-	 * @generated
-	 */
-	public static final int XML_STRUCT = 74;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCT__NAME = EclipseLinkOrmV2_3Package.XML_STRUCT_23__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Struct</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCT_FEATURE_COUNT = EclipseLinkOrmV2_3Package.XML_STRUCT_23_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCT_CONVERTER__NAME = XML_NAMED_CONVERTER__NAME;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCT_CONVERTER__CONVERTER = XML_NAMED_CONVERTER_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Struct Converter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCT_CONVERTER_FEATURE_COUNT = XML_NAMED_CONVERTER_FEATURE_COUNT + 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure <em>Xml Structure</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructure()
-	 * @generated
-	 */
-	public static final int XML_STRUCTURE = 76;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCTURE__ACCESS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCTURE__NAME = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCTURE__ACCESS_METHODS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCTURE__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Xml Structure</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCTURE_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__NAME = OrmPackage.XML_TABLE__NAME;
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__CATALOG = OrmPackage.XML_TABLE__CATALOG;
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__SCHEMA = OrmPackage.XML_TABLE__SCHEMA;
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__UNIQUE_CONSTRAINTS = OrmPackage.XML_TABLE__UNIQUE_CONSTRAINTS;
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE__CREATION_SUFFIX = OrmPackage.XML_TABLE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_FEATURE_COUNT = OrmPackage.XML_TABLE_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__DESCRIPTION = OrmPackage.XML_TABLE_GENERATOR__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__NAME = OrmPackage.XML_TABLE_GENERATOR__NAME;
-	/**
-	 * The feature id for the '<em><b>Initial Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__INITIAL_VALUE = OrmPackage.XML_TABLE_GENERATOR__INITIAL_VALUE;
-	/**
-	 * The feature id for the '<em><b>Allocation Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__ALLOCATION_SIZE = OrmPackage.XML_TABLE_GENERATOR__ALLOCATION_SIZE;
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__TABLE = OrmPackage.XML_TABLE_GENERATOR__TABLE;
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__CATALOG = OrmPackage.XML_TABLE_GENERATOR__CATALOG;
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__SCHEMA = OrmPackage.XML_TABLE_GENERATOR__SCHEMA;
-	/**
-	 * The feature id for the '<em><b>Pk Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__PK_COLUMN_NAME = OrmPackage.XML_TABLE_GENERATOR__PK_COLUMN_NAME;
-	/**
-	 * The feature id for the '<em><b>Value Column Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__VALUE_COLUMN_NAME = OrmPackage.XML_TABLE_GENERATOR__VALUE_COLUMN_NAME;
-	/**
-	 * The feature id for the '<em><b>Pk Column Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__PK_COLUMN_VALUE = OrmPackage.XML_TABLE_GENERATOR__PK_COLUMN_VALUE;
-	/**
-	 * The feature id for the '<em><b>Unique Constraints</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS = OrmPackage.XML_TABLE_GENERATOR__UNIQUE_CONSTRAINTS;
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR__CREATION_SUFFIX = OrmPackage.XML_TABLE_GENERATOR_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the '<em>Xml Table Generator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_FEATURE_COUNT = OrmPackage.XML_TABLE_GENERATOR_FEATURE_COUNT + 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn()
-	 * @generated
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN = 79;
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN__COLUMN_DEFINITION = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN__COLUMN_DEFINITION;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN__NAME = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN__NAME;
-	/**
-	 * The feature id for the '<em><b>Discriminator Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE;
-	/**
-	 * The feature id for the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN__LENGTH = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN__LENGTH;
-	/**
-	 * The feature id for the '<em><b>Context Property</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN__TABLE = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Primary Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 2;
-	/**
-	 * The number of structural features of the '<em>Xml Tenant Discriminator Column</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Hour</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TIME_OF_DAY__HOUR = 0;
-	/**
-	 * The feature id for the '<em><b>Minute</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TIME_OF_DAY__MINUTE = 1;
-	/**
-	 * The feature id for the '<em><b>Second</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TIME_OF_DAY__SECOND = 2;
-	/**
-	 * The feature id for the '<em><b>Millisecond</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TIME_OF_DAY__MILLISECOND = 3;
-	/**
-	 * The number of structural features of the '<em>Xml Time Of Day</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TIME_OF_DAY_FEATURE_COUNT = 4;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION__ACCESS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION__NAME = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION__ATTRIBUTE_TYPE = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION__ACCESS_METHODS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-	/**
-	 * The number of structural features of the '<em>Xml Transformation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSIENT__ACCESS = OrmPackage.XML_TRANSIENT__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSIENT__NAME = OrmPackage.XML_TRANSIENT__NAME;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSIENT__ACCESS_METHODS = OrmPackage.XML_TRANSIENT_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSIENT__PROPERTIES = OrmPackage.XML_TRANSIENT_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Xml Transient</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSIENT_FEATURE_COUNT = OrmPackage.XML_TRANSIENT_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_CONVERTER__NAME = XML_NAMED_CONVERTER__NAME;
-	/**
-	 * The feature id for the '<em><b>Data Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_CONVERTER__DATA_TYPE = XML_NAMED_CONVERTER_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Object Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_CONVERTER__OBJECT_TYPE = XML_NAMED_CONVERTER_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the '<em>Xml Type Converter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TYPE_CONVERTER_FEATURE_COUNT = XML_NAMED_CONVERTER_FEATURE_COUNT + 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning <em>Xml Union Partitioning</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlUnionPartitioning()
-	 * @generated
-	 */
-	public static final int XML_UNION_PARTITIONING = 84;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_UNION_PARTITIONING__NAME = EclipseLinkOrmV2_2Package.XML_UNION_PARTITIONING_22__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Union Partitioning</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_UNION_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_UNION_PARTITIONING_22_FEATURE_COUNT + 0;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning <em>Xml Value Partitioning</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlValuePartitioning()
-	 * @generated
-	 */
-	public static final int XML_VALUE_PARTITIONING = 85;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VALUE_PARTITIONING__NAME = EclipseLinkOrmV2_2Package.XML_VALUE_PARTITIONING_22__NAME;
-	/**
-	 * The number of structural features of the '<em>Xml Value Partitioning</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VALUE_PARTITIONING_FEATURE_COUNT = EclipseLinkOrmV2_2Package.XML_VALUE_PARTITIONING_22_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__ACCESS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__NAME = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING__NAME;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__PROPERTIES = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__PARTITIONING = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 9;
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__PARTITIONED = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 10;
-	/**
-	 * The feature id for the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE__NON_CACHEABLE = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 11;
-	/**
-	 * The number of structural features of the '<em>Xml Variable One To One</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 12;
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__ACCESS = OrmPackage.XML_VERSION__ACCESS;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__NAME = OrmPackage.XML_VERSION__NAME;
-	/**
-	 * The feature id for the '<em><b>Column</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__COLUMN = OrmPackage.XML_VERSION__COLUMN;
-	/**
-	 * The feature id for the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__LOB = OrmPackage.XML_VERSION__LOB;
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__TEMPORAL = OrmPackage.XML_VERSION__TEMPORAL;
-	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__ENUMERATED = OrmPackage.XML_VERSION__ENUMERATED;
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__ATTRIBUTE_TYPE = OrmPackage.XML_VERSION_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__INDEX = OrmPackage.XML_VERSION_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__ACCESS_METHODS = OrmPackage.XML_VERSION_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__PROPERTIES = OrmPackage.XML_VERSION_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__MUTABLE = OrmPackage.XML_VERSION_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__OBJECT_TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__STRUCT_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION__CONVERT = OrmPackage.XML_VERSION_FEATURE_COUNT + 9;
-	/**
-	 * The number of structural features of the '<em>Xml Version</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION_FEATURE_COUNT = OrmPackage.XML_VERSION_FEATURE_COUNT + 10;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType <em>Cache Coordination Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheCoordinationType()
-	 * @generated
-	 */
-	public static final int CACHE_COORDINATION_TYPE = 88;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType <em>Cache Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheType()
-	 * @generated
-	 */
-	public static final int CACHE_TYPE = 89;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType <em>Xml Change Tracking Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingType()
-	 * @generated
-	 */
-	public static final int XML_CHANGE_TRACKING_TYPE = 90;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection <em>Xml Direction</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlDirection()
-	 * @generated
-	 */
-	public static final int XML_DIRECTION = 91;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType <em>Existence Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getExistenceType()
-	 * @generated
-	 */
-	public static final int EXISTENCE_TYPE = 92;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType <em>Xml Join Fetch Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetchType()
-	 * @generated
-	 */
-	public static final int XML_JOIN_FETCH_TYPE = 93;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType <em>Xml Optimistic Locking Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLockingType()
-	 * @generated
-	 */
-	public static final int XML_OPTIMISTIC_LOCKING_TYPE = 94;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAccessMethodsEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAccessMethodsHolderEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAdditionalCriteriaEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlArrayEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAttributeMappingEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass attributesEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicCollectionEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicMapEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBatchFetchEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBatchFetchHolderEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCacheEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCacheHolderEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCacheIndexEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlChangeTrackingEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlChangeTrackingHolderEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCloneCopyPolicyEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCollectionTableEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConversionValueEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConverterEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConverterHolderEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConvertersHolderEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlConvertibleMappingEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCopyPolicyEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCustomizerEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCustomizerHolderEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlElementCollectionEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddableEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedIdEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityMappingsEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlFetchAttributeEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlFetchGroupEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlIdEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlIndexEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlInstantiationCopyPolicyEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJoinFetchEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJoinTableEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToManyEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToOneEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclassEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMultitenantEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMutableEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedConverterEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedPlsqlStoredFunctionQueryEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedPlsqlStoredProcedureQueryEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedStoredFunctionQueryEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedStoredProcedureQueryEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlObjectTypeConverterEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToManyEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToOneEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOptimisticLockingEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOrderColumnEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPersistenceUnitDefaultsEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPersistenceUnitMetadataEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPrimaryKeyEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPrivateOwnedEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPropertyEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPropertyContainerEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlQueryContainerEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlQueryRedirectorsEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlReadOnlyEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlReturnInsertEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlSecondaryTableEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStoredProcedureParameterEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStructEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStructConverterEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStructureEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTableEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTableGeneratorEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTenantDiscriminatorColumnEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTimeOfDayEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransformationEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransientEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTypeConverterEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVariableOneToOneEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVersionEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlHashPartitioningEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPartitioningEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPinnedPartitioningEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPlsqlRecordEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPlsqlTableEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlRangePartitioningEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlReplicationPartitioningEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlRoundRobinPartitioningEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlUnionPartitioningEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlValuePartitioningEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum cacheCoordinationTypeEEnum = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum cacheTypeEEnum = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum xmlChangeTrackingTypeEEnum = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum xmlDirectionEEnum = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum existenceTypeEEnum = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum xmlJoinFetchTypeEEnum = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum xmlOptimisticLockingTypeEEnum = 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EclipseLinkOrmPackage()
-	{
-		super(eNS_URI, EclipseLinkOrmFactory.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 EclipseLinkOrmPackage#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 EclipseLinkOrmPackage init()
-	{
-		if (isInited) return (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
-
-		// Obtain or create and register package
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmPackage());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
-		EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
-		EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
-		EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) : EclipseLinkOrmV2_2Package.eINSTANCE);
-		EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) : EclipseLinkOrmV2_3Package.eINSTANCE);
-		EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) : EclipseLinkOrmV2_4Package.eINSTANCE);
-
-		// Create package meta-data objects
-		theEclipseLinkOrmPackage.createPackageContents();
-		theEclipseLinkOrmV1_1Package.createPackageContents();
-		theEclipseLinkOrmV2_0Package.createPackageContents();
-		theEclipseLinkOrmV2_1Package.createPackageContents();
-		theEclipseLinkOrmV2_2Package.createPackageContents();
-		theEclipseLinkOrmV2_3Package.createPackageContents();
-		theEclipseLinkOrmV2_4Package.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLinkOrmPackage.initializePackageContents();
-		theEclipseLinkOrmV1_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_0Package.initializePackageContents();
-		theEclipseLinkOrmV2_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_2Package.initializePackageContents();
-		theEclipseLinkOrmV2_3Package.initializePackageContents();
-		theEclipseLinkOrmV2_4Package.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLinkOrmPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(EclipseLinkOrmPackage.eNS_URI, theEclipseLinkOrmPackage);
-		return theEclipseLinkOrmPackage;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods <em>Xml Access Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Access Methods</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods
-	 * @generated
-	 */
-	public EClass getXmlAccessMethods()
-	{
-		return xmlAccessMethodsEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods#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.jpa.eclipselink.core.resource.orm.XmlAccessMethods#getGetMethod()
-	 * @see #getXmlAccessMethods()
-	 * @generated
-	 */
-	public EAttribute getXmlAccessMethods_GetMethod()
-	{
-		return (EAttribute)xmlAccessMethodsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods#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.jpa.eclipselink.core.resource.orm.XmlAccessMethods#getSetMethod()
-	 * @see #getXmlAccessMethods()
-	 * @generated
-	 */
-	public EAttribute getXmlAccessMethods_SetMethod()
-	{
-		return (EAttribute)xmlAccessMethodsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder <em>Xml Access Methods Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Access Methods Holder</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder
-	 * @generated
-	 */
-	public EClass getXmlAccessMethodsHolder()
-	{
-		return xmlAccessMethodsHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder#getAccessMethods <em>Access Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Access Methods</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder#getAccessMethods()
-	 * @see #getXmlAccessMethodsHolder()
-	 * @generated
-	 */
-	public EReference getXmlAccessMethodsHolder_AccessMethods()
-	{
-		return (EReference)xmlAccessMethodsHolderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria <em>Xml Additional Criteria</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Additional Criteria</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria
-	 * @generated
-	 */
-	public EClass getXmlAdditionalCriteria()
-	{
-		return xmlAdditionalCriteriaEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray <em>Xml Array</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Array</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray
-	 * @generated
-	 */
-	public EClass getXmlArray()
-	{
-		return xmlArrayEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Attribute Mapping</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping
-	 * @generated
-	 */
-	public EClass getXmlAttributeMapping()
-	{
-		return xmlAttributeMappingEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes <em>Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Attributes</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes
-	 * @generated
-	 */
-	public EClass getAttributes()
-	{
-		return attributesEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getBasicCollections <em>Basic Collections</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Basic Collections</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getBasicCollections()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_BasicCollections()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getBasicMaps <em>Basic Maps</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Basic Maps</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getBasicMaps()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_BasicMaps()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getTransformations <em>Transformations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Transformations</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getTransformations()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_Transformations()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getVariableOneToOnes <em>Variable One To Ones</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Variable One To Ones</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes#getVariableOneToOnes()
-	 * @see #getAttributes()
-	 * @generated
-	 */
-	public EReference getAttributes_VariableOneToOnes()
-	{
-		return (EReference)attributesEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic <em>Xml Basic</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic
-	 * @generated
-	 */
-	public EClass getXmlBasic()
-	{
-		return xmlBasicEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Collection</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection
-	 * @generated
-	 */
-	public EClass getXmlBasicCollection()
-	{
-		return xmlBasicCollectionEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Map</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap
-	 * @generated
-	 */
-	public EClass getXmlBasicMap()
-	{
-		return xmlBasicMapEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetch <em>Xml Batch Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Batch Fetch</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetch
-	 * @generated
-	 */
-	public EClass getXmlBatchFetch()
-	{
-		return xmlBatchFetchEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder <em>Xml Batch Fetch Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Batch Fetch Holder</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder
-	 * @generated
-	 */
-	public EClass getXmlBatchFetchHolder()
-	{
-		return xmlBatchFetchHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder#getBatchFetch <em>Batch Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Batch Fetch</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder#getBatchFetch()
-	 * @see #getXmlBatchFetchHolder()
-	 * @generated
-	 */
-	public EReference getXmlBatchFetchHolder_BatchFetch()
-	{
-		return (EReference)xmlBatchFetchHolderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache <em>Xml Cache</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Cache</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache
-	 * @generated
-	 */
-	public EClass getXmlCache()
-	{
-		return xmlCacheEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getExpiry <em>Expiry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Expiry</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getExpiry()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EAttribute getXmlCache_Expiry()
-	{
-		return (EAttribute)xmlCacheEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getSize <em>Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Size</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getSize()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EAttribute getXmlCache_Size()
-	{
-		return (EAttribute)xmlCacheEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getShared <em>Shared</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Shared</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getShared()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EAttribute getXmlCache_Shared()
-	{
-		return (EAttribute)xmlCacheEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getType()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EAttribute getXmlCache_Type()
-	{
-		return (EAttribute)xmlCacheEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getAlwaysRefresh <em>Always Refresh</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Always Refresh</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getAlwaysRefresh()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EAttribute getXmlCache_AlwaysRefresh()
-	{
-		return (EAttribute)xmlCacheEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getRefreshOnlyIfNewer <em>Refresh Only If Newer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Refresh Only If Newer</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getRefreshOnlyIfNewer()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EAttribute getXmlCache_RefreshOnlyIfNewer()
-	{
-		return (EAttribute)xmlCacheEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getDisableHits <em>Disable Hits</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Disable Hits</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getDisableHits()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EAttribute getXmlCache_DisableHits()
-	{
-		return (EAttribute)xmlCacheEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getCoordinationType <em>Coordination Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Coordination Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getCoordinationType()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EAttribute getXmlCache_CoordinationType()
-	{
-		return (EAttribute)xmlCacheEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getExpiryTimeOfDay <em>Expiry Time Of Day</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Expiry Time Of Day</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getExpiryTimeOfDay()
-	 * @see #getXmlCache()
-	 * @generated
-	 */
-	public EReference getXmlCache_ExpiryTimeOfDay()
-	{
-		return (EReference)xmlCacheEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder <em>Xml Cache Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Cache Holder</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder
-	 * @generated
-	 */
-	public EClass getXmlCacheHolder()
-	{
-		return xmlCacheHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder#getCache <em>Cache</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cache</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder#getCache()
-	 * @see #getXmlCacheHolder()
-	 * @generated
-	 */
-	public EReference getXmlCacheHolder_Cache()
-	{
-		return (EReference)xmlCacheHolderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder#getExistenceChecking <em>Existence Checking</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Existence Checking</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder#getExistenceChecking()
-	 * @see #getXmlCacheHolder()
-	 * @generated
-	 */
-	public EAttribute getXmlCacheHolder_ExistenceChecking()
-	{
-		return (EAttribute)xmlCacheHolderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex <em>Xml Cache Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Cache Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex
-	 * @generated
-	 */
-	public EClass getXmlCacheIndex()
-	{
-		return xmlCacheIndexEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking <em>Xml Change Tracking</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Change Tracking</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking
-	 * @generated
-	 */
-	public EClass getXmlChangeTracking()
-	{
-		return xmlChangeTrackingEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking#getType()
-	 * @see #getXmlChangeTracking()
-	 * @generated
-	 */
-	public EAttribute getXmlChangeTracking_Type()
-	{
-		return (EAttribute)xmlChangeTrackingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder <em>Xml Change Tracking Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Change Tracking Holder</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder
-	 * @generated
-	 */
-	public EClass getXmlChangeTrackingHolder()
-	{
-		return xmlChangeTrackingHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder#getChangeTracking <em>Change Tracking</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Change Tracking</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder#getChangeTracking()
-	 * @see #getXmlChangeTrackingHolder()
-	 * @generated
-	 */
-	public EReference getXmlChangeTrackingHolder_ChangeTracking()
-	{
-		return (EReference)xmlChangeTrackingHolderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy <em>Xml Clone Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Clone Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy
-	 * @generated
-	 */
-	public EClass getXmlCloneCopyPolicy()
-	{
-		return xmlCloneCopyPolicyEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getMethod <em>Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Method</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getMethod()
-	 * @see #getXmlCloneCopyPolicy()
-	 * @generated
-	 */
-	public EAttribute getXmlCloneCopyPolicy_Method()
-	{
-		return (EAttribute)xmlCloneCopyPolicyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getWorkingCopyMethod <em>Working Copy Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Working Copy Method</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getWorkingCopyMethod()
-	 * @see #getXmlCloneCopyPolicy()
-	 * @generated
-	 */
-	public EAttribute getXmlCloneCopyPolicy_WorkingCopyMethod()
-	{
-		return (EAttribute)xmlCloneCopyPolicyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Collection Table</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCollectionTable
-	 * @generated
-	 */
-	public EClass getXmlCollectionTable()
-	{
-		return xmlCollectionTableEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Conversion Value</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue
-	 * @generated
-	 */
-	public EClass getXmlConversionValue()
-	{
-		return xmlConversionValueEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue#getDataValue <em>Data Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Data Value</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue#getDataValue()
-	 * @see #getXmlConversionValue()
-	 * @generated
-	 */
-	public EAttribute getXmlConversionValue_DataValue()
-	{
-		return (EAttribute)xmlConversionValueEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue#getObjectValue <em>Object Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Object Value</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue#getObjectValue()
-	 * @see #getXmlConversionValue()
-	 * @generated
-	 */
-	public EAttribute getXmlConversionValue_ObjectValue()
-	{
-		return (EAttribute)xmlConversionValueEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter <em>Xml Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter
-	 * @generated
-	 */
-	public EClass getXmlConverter()
-	{
-		return xmlConverterEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter#getClassName <em>Class Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter#getClassName()
-	 * @see #getXmlConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlConverter_ClassName()
-	{
-		return (EAttribute)xmlConverterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Converter Holder</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder
-	 * @generated
-	 */
-	public EClass getXmlConverterHolder()
-	{
-		return xmlConverterHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getConverter <em>Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getConverter()
-	 * @see #getXmlConverterHolder()
-	 * @generated
-	 */
-	public EReference getXmlConverterHolder_Converter()
-	{
-		return (EReference)xmlConverterHolderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getTypeConverter <em>Type Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Type Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getTypeConverter()
-	 * @see #getXmlConverterHolder()
-	 * @generated
-	 */
-	public EReference getXmlConverterHolder_TypeConverter()
-	{
-		return (EReference)xmlConverterHolderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getObjectTypeConverter <em>Object Type Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Object Type Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getObjectTypeConverter()
-	 * @see #getXmlConverterHolder()
-	 * @generated
-	 */
-	public EReference getXmlConverterHolder_ObjectTypeConverter()
-	{
-		return (EReference)xmlConverterHolderEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getStructConverter <em>Struct Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Struct Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getStructConverter()
-	 * @see #getXmlConverterHolder()
-	 * @generated
-	 */
-	public EReference getXmlConverterHolder_StructConverter()
-	{
-		return (EReference)xmlConverterHolderEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder <em>Xml Converters Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Converters Holder</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder
-	 * @generated
-	 */
-	public EClass getXmlConvertersHolder()
-	{
-		return xmlConvertersHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getConverters <em>Converters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Converters</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getConverters()
-	 * @see #getXmlConvertersHolder()
-	 * @generated
-	 */
-	public EReference getXmlConvertersHolder_Converters()
-	{
-		return (EReference)xmlConvertersHolderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getTypeConverters <em>Type Converters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Type Converters</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getTypeConverters()
-	 * @see #getXmlConvertersHolder()
-	 * @generated
-	 */
-	public EReference getXmlConvertersHolder_TypeConverters()
-	{
-		return (EReference)xmlConvertersHolderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getObjectTypeConverters <em>Object Type Converters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Object Type Converters</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getObjectTypeConverters()
-	 * @see #getXmlConvertersHolder()
-	 * @generated
-	 */
-	public EReference getXmlConvertersHolder_ObjectTypeConverters()
-	{
-		return (EReference)xmlConvertersHolderEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getStructConverters <em>Struct Converters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Struct Converters</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getStructConverters()
-	 * @see #getXmlConvertersHolder()
-	 * @generated
-	 */
-	public EReference getXmlConvertersHolder_StructConverters()
-	{
-		return (EReference)xmlConvertersHolderEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping <em>Xml Convertible Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Convertible Mapping</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping
-	 * @generated
-	 */
-	public EClass getXmlConvertibleMapping()
-	{
-		return xmlConvertibleMappingEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping#getConvert <em>Convert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Convert</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping#getConvert()
-	 * @see #getXmlConvertibleMapping()
-	 * @generated
-	 */
-	public EAttribute getXmlConvertibleMapping_Convert()
-	{
-		return (EAttribute)xmlConvertibleMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy <em>Xml Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy
-	 * @generated
-	 */
-	public EClass getXmlCopyPolicy()
-	{
-		return xmlCopyPolicyEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy#getClass_ <em>Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Class</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy#getClass_()
-	 * @see #getXmlCopyPolicy()
-	 * @generated
-	 */
-	public EAttribute getXmlCopyPolicy_Class()
-	{
-		return (EAttribute)xmlCopyPolicyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer <em>Xml Customizer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Customizer</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer
-	 * @generated
-	 */
-	public EClass getXmlCustomizer()
-	{
-		return xmlCustomizerEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer#getCustomizerClassName <em>Customizer Class Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Customizer Class Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer#getCustomizerClassName()
-	 * @see #getXmlCustomizer()
-	 * @generated
-	 */
-	public EAttribute getXmlCustomizer_CustomizerClassName()
-	{
-		return (EAttribute)xmlCustomizerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder <em>Xml Customizer Holder</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Customizer Holder</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder
-	 * @generated
-	 */
-	public EClass getXmlCustomizerHolder()
-	{
-		return xmlCustomizerHolderEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder#getCustomizer <em>Customizer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Customizer</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder#getCustomizer()
-	 * @see #getXmlCustomizerHolder()
-	 * @generated
-	 */
-	public EReference getXmlCustomizerHolder_Customizer()
-	{
-		return (EReference)xmlCustomizerHolderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Element Collection</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection
-	 * @generated
-	 */
-	public EClass getXmlElementCollection()
-	{
-		return xmlElementCollectionEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embeddable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable
-	 * @generated
-	 */
-	public EClass getXmlEmbeddable()
-	{
-		return xmlEmbeddableEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCopyPolicy <em>Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCopyPolicy()
-	 * @see #getXmlEmbeddable()
-	 * @generated
-	 */
-	public EReference getXmlEmbeddable_CopyPolicy()
-	{
-		return (EReference)xmlEmbeddableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Instantiation Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getInstantiationCopyPolicy()
-	 * @see #getXmlEmbeddable()
-	 * @generated
-	 */
-	public EReference getXmlEmbeddable_InstantiationCopyPolicy()
-	{
-		return (EReference)xmlEmbeddableEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCloneCopyPolicy <em>Clone Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Clone Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCloneCopyPolicy()
-	 * @see #getXmlEmbeddable()
-	 * @generated
-	 */
-	public EReference getXmlEmbeddable_CloneCopyPolicy()
-	{
-		return (EReference)xmlEmbeddableEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Default Mappings</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getExcludeDefaultMappings()
-	 * @see #getXmlEmbeddable()
-	 * @generated
-	 */
-	public EAttribute getXmlEmbeddable_ExcludeDefaultMappings()
-	{
-		return (EAttribute)xmlEmbeddableEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embedded</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded
-	 * @generated
-	 */
-	public EClass getXmlEmbedded()
-	{
-		return xmlEmbeddedEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embedded Id</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedId()
-	{
-		return xmlEmbeddedIdEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity <em>Xml Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity
-	 * @generated
-	 */
-	public EClass getXmlEntity()
-	{
-		return xmlEntityEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getOptimisticLocking <em>Optimistic Locking</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Optimistic Locking</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getOptimisticLocking()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_OptimisticLocking()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCopyPolicy <em>Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCopyPolicy()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_CopyPolicy()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Instantiation Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getInstantiationCopyPolicy()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_InstantiationCopyPolicy()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCloneCopyPolicy <em>Clone Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Clone Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCloneCopyPolicy()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EReference getXmlEntity_CloneCopyPolicy()
-	{
-		return (EReference)xmlEntityEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Default Mappings</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getExcludeDefaultMappings()
-	 * @see #getXmlEntity()
-	 * @generated
-	 */
-	public EAttribute getXmlEntity_ExcludeDefaultMappings()
-	{
-		return (EAttribute)xmlEntityEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity Mappings</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings
-	 * @generated
-	 */
-	public EClass getXmlEntityMappings()
-	{
-		return xmlEntityMappingsEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute <em>Xml Fetch Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Fetch Attribute</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute
-	 * @generated
-	 */
-	public EClass getXmlFetchAttribute()
-	{
-		return xmlFetchAttributeEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup <em>Xml Fetch Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Fetch Group</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup
-	 * @generated
-	 */
-	public EClass getXmlFetchGroup()
-	{
-		return xmlFetchGroupEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Id</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId
-	 * @generated
-	 */
-	public EClass getXmlId()
-	{
-		return xmlIdEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex <em>Xml Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex
-	 * @generated
-	 */
-	public EClass getXmlIndex()
-	{
-		return xmlIndexEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlInstantiationCopyPolicy <em>Xml Instantiation Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Instantiation Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlInstantiationCopyPolicy
-	 * @generated
-	 */
-	public EClass getXmlInstantiationCopyPolicy()
-	{
-		return xmlInstantiationCopyPolicyEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch <em>Xml Join Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Join Fetch</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch
-	 * @generated
-	 */
-	public EClass getXmlJoinFetch()
-	{
-		return xmlJoinFetchEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch#getJoinFetch <em>Join Fetch</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Join Fetch</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch#getJoinFetch()
-	 * @see #getXmlJoinFetch()
-	 * @generated
-	 */
-	public EAttribute getXmlJoinFetch_JoinFetch()
-	{
-		return (EAttribute)xmlJoinFetchEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Join Table</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable
-	 * @generated
-	 */
-	public EClass getXmlJoinTable()
-	{
-		return xmlJoinTableEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To Many</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany
-	 * @generated
-	 */
-	public EClass getXmlManyToMany()
-	{
-		return xmlManyToManyEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To One</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne
-	 * @generated
-	 */
-	public EClass getXmlManyToOne()
-	{
-		return xmlManyToOneEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mapped Superclass</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass()
-	{
-		return xmlMappedSuperclassEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getOptimisticLocking <em>Optimistic Locking</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Optimistic Locking</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getOptimisticLocking()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_OptimisticLocking()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCopyPolicy <em>Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCopyPolicy()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_CopyPolicy()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Instantiation Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getInstantiationCopyPolicy()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_InstantiationCopyPolicy()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCloneCopyPolicy <em>Clone Copy Policy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Clone Copy Policy</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCloneCopyPolicy()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_CloneCopyPolicy()
-	{
-		return (EReference)xmlMappedSuperclassEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Default Mappings</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getExcludeDefaultMappings()
-	 * @see #getXmlMappedSuperclass()
-	 * @generated
-	 */
-	public EAttribute getXmlMappedSuperclass_ExcludeDefaultMappings()
-	{
-		return (EAttribute)xmlMappedSuperclassEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant <em>Xml Multitenant</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Multitenant</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant
-	 * @generated
-	 */
-	public EClass getXmlMultitenant()
-	{
-		return xmlMultitenantEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mutable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable
-	 * @generated
-	 */
-	public EClass getXmlMutable()
-	{
-		return xmlMutableEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable#getMutable <em>Mutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Mutable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable#getMutable()
-	 * @see #getXmlMutable()
-	 * @generated
-	 */
-	public EAttribute getXmlMutable_Mutable()
-	{
-		return (EAttribute)xmlMutableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter <em>Xml Named Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter
-	 * @generated
-	 */
-	public EClass getXmlNamedConverter()
-	{
-		return xmlNamedConverterEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter#getName()
-	 * @see #getXmlNamedConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedConverter_Name()
-	{
-		return (EAttribute)xmlNamedConverterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery <em>Xml Named Plsql Stored Function Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Plsql Stored Function Query</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery
-	 * @generated
-	 */
-	public EClass getXmlNamedPlsqlStoredFunctionQuery()
-	{
-		return xmlNamedPlsqlStoredFunctionQueryEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery <em>Xml Named Plsql Stored Procedure Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Plsql Stored Procedure Query</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery
-	 * @generated
-	 */
-	public EClass getXmlNamedPlsqlStoredProcedureQuery()
-	{
-		return xmlNamedPlsqlStoredProcedureQueryEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery <em>Xml Named Stored Function Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Stored Function Query</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery
-	 * @generated
-	 */
-	public EClass getXmlNamedStoredFunctionQuery()
-	{
-		return xmlNamedStoredFunctionQueryEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery <em>Xml Named Stored Procedure Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Stored Procedure Query</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery
-	 * @generated
-	 */
-	public EClass getXmlNamedStoredProcedureQuery()
-	{
-		return xmlNamedStoredProcedureQueryEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getName()
-	 * @see #getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedStoredProcedureQuery_Name()
-	{
-		return (EAttribute)xmlNamedStoredProcedureQueryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultClass <em>Result Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Result Class</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultClass()
-	 * @see #getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedStoredProcedureQuery_ResultClass()
-	{
-		return (EAttribute)xmlNamedStoredProcedureQueryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultSetMapping <em>Result Set Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Result Set Mapping</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultSetMapping()
-	 * @see #getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedStoredProcedureQuery_ResultSetMapping()
-	{
-		return (EAttribute)xmlNamedStoredProcedureQueryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getProcedureName <em>Procedure Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Procedure Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getProcedureName()
-	 * @see #getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedStoredProcedureQuery_ProcedureName()
-	{
-		return (EAttribute)xmlNamedStoredProcedureQueryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getReturnsResultSet <em>Returns Result Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Returns Result Set</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getReturnsResultSet()
-	 * @see #getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedStoredProcedureQuery_ReturnsResultSet()
-	{
-		return (EAttribute)xmlNamedStoredProcedureQueryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getHints <em>Hints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Hints</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getHints()
-	 * @see #getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public EReference getXmlNamedStoredProcedureQuery_Hints()
-	{
-		return (EReference)xmlNamedStoredProcedureQueryEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getParameters <em>Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Parameters</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getParameters()
-	 * @see #getXmlNamedStoredProcedureQuery()
-	 * @generated
-	 */
-	public EReference getXmlNamedStoredProcedureQuery_Parameters()
-	{
-		return (EReference)xmlNamedStoredProcedureQueryEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Object Type Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter
-	 * @generated
-	 */
-	public EClass getXmlObjectTypeConverter()
-	{
-		return xmlObjectTypeConverterEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDataType <em>Data Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Data Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDataType()
-	 * @see #getXmlObjectTypeConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlObjectTypeConverter_DataType()
-	{
-		return (EAttribute)xmlObjectTypeConverterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getObjectType <em>Object Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Object Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getObjectType()
-	 * @see #getXmlObjectTypeConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlObjectTypeConverter_ObjectType()
-	{
-		return (EAttribute)xmlObjectTypeConverterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getConversionValues <em>Conversion Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Conversion Values</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getConversionValues()
-	 * @see #getXmlObjectTypeConverter()
-	 * @generated
-	 */
-	public EReference getXmlObjectTypeConverter_ConversionValues()
-	{
-		return (EReference)xmlObjectTypeConverterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDefaultObjectValue <em>Default Object Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Default Object Value</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDefaultObjectValue()
-	 * @see #getXmlObjectTypeConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlObjectTypeConverter_DefaultObjectValue()
-	{
-		return (EAttribute)xmlObjectTypeConverterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To Many</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany
-	 * @generated
-	 */
-	public EClass getXmlOneToMany()
-	{
-		return xmlOneToManyEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To One</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne
-	 * @generated
-	 */
-	public EClass getXmlOneToOne()
-	{
-		return xmlOneToOneEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking <em>Xml Optimistic Locking</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Optimistic Locking</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking
-	 * @generated
-	 */
-	public EClass getXmlOptimisticLocking()
-	{
-		return xmlOptimisticLockingEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getType()
-	 * @see #getXmlOptimisticLocking()
-	 * @generated
-	 */
-	public EAttribute getXmlOptimisticLocking_Type()
-	{
-		return (EAttribute)xmlOptimisticLockingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getCascade <em>Cascade</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getCascade()
-	 * @see #getXmlOptimisticLocking()
-	 * @generated
-	 */
-	public EAttribute getXmlOptimisticLocking_Cascade()
-	{
-		return (EAttribute)xmlOptimisticLockingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getSelectedColumns <em>Selected Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Selected Columns</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getSelectedColumns()
-	 * @see #getXmlOptimisticLocking()
-	 * @generated
-	 */
-	public EReference getXmlOptimisticLocking_SelectedColumns()
-	{
-		return (EReference)xmlOptimisticLockingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Order Column</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOrderColumn
-	 * @generated
-	 */
-	public EClass getXmlOrderColumn()
-	{
-		return xmlOrderColumnEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Persistence Unit Defaults</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults
-	 * @generated
-	 */
-	public EClass getXmlPersistenceUnitDefaults()
-	{
-		return xmlPersistenceUnitDefaultsEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Persistence Unit Metadata</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata
-	 * @generated
-	 */
-	public EClass getXmlPersistenceUnitMetadata()
-	{
-		return xmlPersistenceUnitMetadataEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata#isExcludeDefaultMappings <em>Exclude Default Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Exclude Default Mappings</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata#isExcludeDefaultMappings()
-	 * @see #getXmlPersistenceUnitMetadata()
-	 * @generated
-	 */
-	public EAttribute getXmlPersistenceUnitMetadata_ExcludeDefaultMappings()
-	{
-		return (EAttribute)xmlPersistenceUnitMetadataEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey <em>Xml Primary Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Primary Key</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey
-	 * @generated
-	 */
-	public EClass getXmlPrimaryKey()
-	{
-		return xmlPrimaryKeyEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned <em>Xml Private Owned</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Private Owned</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned
-	 * @generated
-	 */
-	public EClass getXmlPrivateOwned()
-	{
-		return xmlPrivateOwnedEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned#isPrivateOwned <em>Private Owned</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Private Owned</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned#isPrivateOwned()
-	 * @see #getXmlPrivateOwned()
-	 * @generated
-	 */
-	public EAttribute getXmlPrivateOwned_PrivateOwned()
-	{
-		return (EAttribute)xmlPrivateOwnedEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty <em>Xml Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Property</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty
-	 * @generated
-	 */
-	public EClass getXmlProperty()
-	{
-		return xmlPropertyEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#getName()
-	 * @see #getXmlProperty()
-	 * @generated
-	 */
-	public EAttribute getXmlProperty_Name()
-	{
-		return (EAttribute)xmlPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#getValue()
-	 * @see #getXmlProperty()
-	 * @generated
-	 */
-	public EAttribute getXmlProperty_Value()
-	{
-		return (EAttribute)xmlPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#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.jpa.eclipselink.core.resource.orm.XmlProperty#getValueType()
-	 * @see #getXmlProperty()
-	 * @generated
-	 */
-	public EAttribute getXmlProperty_ValueType()
-	{
-		return (EAttribute)xmlPropertyEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer <em>Xml Property Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Property Container</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer
-	 * @generated
-	 */
-	public EClass getXmlPropertyContainer()
-	{
-		return xmlPropertyContainerEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer#getProperties <em>Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Properties</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer#getProperties()
-	 * @see #getXmlPropertyContainer()
-	 * @generated
-	 */
-	public EReference getXmlPropertyContainer_Properties()
-	{
-		return (EReference)xmlPropertyContainerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer <em>Xml Query Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Query Container</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer
-	 * @generated
-	 */
-	public EClass getXmlQueryContainer()
-	{
-		return xmlQueryContainerEClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer#getNamedStoredProcedureQueries <em>Named Stored Procedure Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Stored Procedure Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer#getNamedStoredProcedureQueries()
-	 * @see #getXmlQueryContainer()
-	 * @generated
-	 */
-	public EReference getXmlQueryContainer_NamedStoredProcedureQueries()
-	{
-		return (EReference)xmlQueryContainerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors <em>Xml Query Redirectors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Query Redirectors</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors
-	 * @generated
-	 */
-	public EClass getXmlQueryRedirectors()
-	{
-		return xmlQueryRedirectorsEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly <em>Xml Read Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Read Only</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly
-	 * @generated
-	 */
-	public EClass getXmlReadOnly()
-	{
-		return xmlReadOnlyEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly#getReadOnly <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.jpa.eclipselink.core.resource.orm.XmlReadOnly#getReadOnly()
-	 * @see #getXmlReadOnly()
-	 * @generated
-	 */
-	public EAttribute getXmlReadOnly_ReadOnly()
-	{
-		return (EAttribute)xmlReadOnlyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert <em>Xml Return Insert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Return Insert</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert
-	 * @generated
-	 */
-	public EClass getXmlReturnInsert()
-	{
-		return xmlReturnInsertEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Secondary Table</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlSecondaryTable
-	 * @generated
-	 */
-	public EClass getXmlSecondaryTable()
-	{
-		return xmlSecondaryTableEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Stored Procedure Parameter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter
-	 * @generated
-	 */
-	public EClass getXmlStoredProcedureParameter()
-	{
-		return xmlStoredProcedureParameterEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getDirection <em>Direction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Direction</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getDirection()
-	 * @see #getXmlStoredProcedureParameter()
-	 * @generated
-	 */
-	public EAttribute getXmlStoredProcedureParameter_Direction()
-	{
-		return (EAttribute)xmlStoredProcedureParameterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getName()
-	 * @see #getXmlStoredProcedureParameter()
-	 * @generated
-	 */
-	public EAttribute getXmlStoredProcedureParameter_Name()
-	{
-		return (EAttribute)xmlStoredProcedureParameterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getQueryParameter <em>Query Parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Query Parameter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getQueryParameter()
-	 * @see #getXmlStoredProcedureParameter()
-	 * @generated
-	 */
-	public EAttribute getXmlStoredProcedureParameter_QueryParameter()
-	{
-		return (EAttribute)xmlStoredProcedureParameterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getType()
-	 * @see #getXmlStoredProcedureParameter()
-	 * @generated
-	 */
-	public EAttribute getXmlStoredProcedureParameter_Type()
-	{
-		return (EAttribute)xmlStoredProcedureParameterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcType <em>Jdbc Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jdbc Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcType()
-	 * @see #getXmlStoredProcedureParameter()
-	 * @generated
-	 */
-	public EAttribute getXmlStoredProcedureParameter_JdbcType()
-	{
-		return (EAttribute)xmlStoredProcedureParameterEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcTypeName <em>Jdbc Type Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jdbc Type Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcTypeName()
-	 * @see #getXmlStoredProcedureParameter()
-	 * @generated
-	 */
-	public EAttribute getXmlStoredProcedureParameter_JdbcTypeName()
-	{
-		return (EAttribute)xmlStoredProcedureParameterEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStruct <em>Xml Struct</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Struct</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStruct
-	 * @generated
-	 */
-	public EClass getXmlStruct()
-	{
-		return xmlStructEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter <em>Xml Struct Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Struct Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter
-	 * @generated
-	 */
-	public EClass getXmlStructConverter()
-	{
-		return xmlStructConverterEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter#getConverter <em>Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter#getConverter()
-	 * @see #getXmlStructConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlStructConverter_Converter()
-	{
-		return (EAttribute)xmlStructConverterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure <em>Xml Structure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Structure</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure
-	 * @generated
-	 */
-	public EClass getXmlStructure()
-	{
-		return xmlStructureEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTable <em>Xml Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Table</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTable
-	 * @generated
-	 */
-	public EClass getXmlTable()
-	{
-		return xmlTableEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Table Generator</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator
-	 * @generated
-	 */
-	public EClass getXmlTableGenerator()
-	{
-		return xmlTableGeneratorEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Tenant Discriminator Column</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn
-	 * @generated
-	 */
-	public EClass getXmlTenantDiscriminatorColumn()
-	{
-		return xmlTenantDiscriminatorColumnEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay <em>Xml Time Of Day</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Time Of Day</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay
-	 * @generated
-	 */
-	public EClass getXmlTimeOfDay()
-	{
-		return xmlTimeOfDayEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getHour <em>Hour</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hour</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getHour()
-	 * @see #getXmlTimeOfDay()
-	 * @generated
-	 */
-	public EAttribute getXmlTimeOfDay_Hour()
-	{
-		return (EAttribute)xmlTimeOfDayEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getMinute <em>Minute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Minute</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getMinute()
-	 * @see #getXmlTimeOfDay()
-	 * @generated
-	 */
-	public EAttribute getXmlTimeOfDay_Minute()
-	{
-		return (EAttribute)xmlTimeOfDayEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getSecond <em>Second</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Second</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getSecond()
-	 * @see #getXmlTimeOfDay()
-	 * @generated
-	 */
-	public EAttribute getXmlTimeOfDay_Second()
-	{
-		return (EAttribute)xmlTimeOfDayEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getMillisecond <em>Millisecond</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Millisecond</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getMillisecond()
-	 * @see #getXmlTimeOfDay()
-	 * @generated
-	 */
-	public EAttribute getXmlTimeOfDay_Millisecond()
-	{
-		return (EAttribute)xmlTimeOfDayEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Transformation</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation
-	 * @generated
-	 */
-	public EClass getXmlTransformation()
-	{
-		return xmlTransformationEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransient <em>Xml Transient</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Transient</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransient
-	 * @generated
-	 */
-	public EClass getXmlTransient()
-	{
-		return xmlTransientEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Type Converter</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter
-	 * @generated
-	 */
-	public EClass getXmlTypeConverter()
-	{
-		return xmlTypeConverterEClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter#getDataType <em>Data Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Data Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter#getDataType()
-	 * @see #getXmlTypeConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlTypeConverter_DataType()
-	{
-		return (EAttribute)xmlTypeConverterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter#getObjectType <em>Object Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Object Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter#getObjectType()
-	 * @see #getXmlTypeConverter()
-	 * @generated
-	 */
-	public EAttribute getXmlTypeConverter_ObjectType()
-	{
-		return (EAttribute)xmlTypeConverterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Variable One To One</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne
-	 * @generated
-	 */
-	public EClass getXmlVariableOneToOne()
-	{
-		return xmlVariableOneToOneEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion <em>Xml Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Version</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion
-	 * @generated
-	 */
-	public EClass getXmlVersion()
-	{
-		return xmlVersionEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning <em>Xml Hash Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Hash Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning
-	 * @generated
-	 */
-	public EClass getXmlHashPartitioning()
-	{
-		return xmlHashPartitioningEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning <em>Xml Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning
-	 * @generated
-	 */
-	public EClass getXmlPartitioning()
-	{
-		return xmlPartitioningEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning <em>Xml Pinned Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Pinned Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning
-	 * @generated
-	 */
-	public EClass getXmlPinnedPartitioning()
-	{
-		return xmlPinnedPartitioningEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord <em>Xml Plsql Record</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Plsql Record</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord
-	 * @generated
-	 */
-	public EClass getXmlPlsqlRecord()
-	{
-		return xmlPlsqlRecordEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable <em>Xml Plsql Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Plsql Table</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable
-	 * @generated
-	 */
-	public EClass getXmlPlsqlTable()
-	{
-		return xmlPlsqlTableEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning <em>Xml Range Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Range Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning
-	 * @generated
-	 */
-	public EClass getXmlRangePartitioning()
-	{
-		return xmlRangePartitioningEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning <em>Xml Replication Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Replication Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning
-	 * @generated
-	 */
-	public EClass getXmlReplicationPartitioning()
-	{
-		return xmlReplicationPartitioningEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning <em>Xml Round Robin Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Round Robin Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning
-	 * @generated
-	 */
-	public EClass getXmlRoundRobinPartitioning()
-	{
-		return xmlRoundRobinPartitioningEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning <em>Xml Union Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Union Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning
-	 * @generated
-	 */
-	public EClass getXmlUnionPartitioning()
-	{
-		return xmlUnionPartitioningEClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning <em>Xml Value Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Value Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning
-	 * @generated
-	 */
-	public EClass getXmlValuePartitioning()
-	{
-		return xmlValuePartitioningEClass;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType <em>Cache Coordination Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Cache Coordination Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType
-	 * @generated
-	 */
-	public EEnum getCacheCoordinationType()
-	{
-		return cacheCoordinationTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType <em>Cache Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Cache Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType
-	 * @generated
-	 */
-	public EEnum getCacheType()
-	{
-		return cacheTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType <em>Xml Change Tracking Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Xml Change Tracking Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType
-	 * @generated
-	 */
-	public EEnum getXmlChangeTrackingType()
-	{
-		return xmlChangeTrackingTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection <em>Xml Direction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Xml Direction</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection
-	 * @generated
-	 */
-	public EEnum getXmlDirection()
-	{
-		return xmlDirectionEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType <em>Existence Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Existence Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-	 * @generated
-	 */
-	public EEnum getExistenceType()
-	{
-		return existenceTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType <em>Xml Join Fetch Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Xml Join Fetch Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @generated
-	 */
-	public EEnum getXmlJoinFetchType()
-	{
-		return xmlJoinFetchTypeEEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType <em>Xml Optimistic Locking Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Xml Optimistic Locking Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType
-	 * @generated
-	 */
-	public EEnum getXmlOptimisticLockingType()
-	{
-		return xmlOptimisticLockingTypeEEnum;
-	}
-
-	/**
-	 * 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 EclipseLinkOrmFactory getEclipseLinkOrmFactory()
-	{
-		return (EclipseLinkOrmFactory)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
-		xmlAccessMethodsEClass = createEClass(XML_ACCESS_METHODS);
-		createEAttribute(xmlAccessMethodsEClass, XML_ACCESS_METHODS__GET_METHOD);
-		createEAttribute(xmlAccessMethodsEClass, XML_ACCESS_METHODS__SET_METHOD);
-
-		xmlAccessMethodsHolderEClass = createEClass(XML_ACCESS_METHODS_HOLDER);
-		createEReference(xmlAccessMethodsHolderEClass, XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS);
-
-		xmlAdditionalCriteriaEClass = createEClass(XML_ADDITIONAL_CRITERIA);
-
-		xmlArrayEClass = createEClass(XML_ARRAY);
-
-		xmlAttributeMappingEClass = createEClass(XML_ATTRIBUTE_MAPPING);
-
-		attributesEClass = createEClass(ATTRIBUTES);
-		createEReference(attributesEClass, ATTRIBUTES__BASIC_COLLECTIONS);
-		createEReference(attributesEClass, ATTRIBUTES__BASIC_MAPS);
-		createEReference(attributesEClass, ATTRIBUTES__TRANSFORMATIONS);
-		createEReference(attributesEClass, ATTRIBUTES__VARIABLE_ONE_TO_ONES);
-
-		xmlBasicEClass = createEClass(XML_BASIC);
-
-		xmlBasicCollectionEClass = createEClass(XML_BASIC_COLLECTION);
-
-		xmlBasicMapEClass = createEClass(XML_BASIC_MAP);
-
-		xmlBatchFetchEClass = createEClass(XML_BATCH_FETCH);
-
-		xmlBatchFetchHolderEClass = createEClass(XML_BATCH_FETCH_HOLDER);
-		createEReference(xmlBatchFetchHolderEClass, XML_BATCH_FETCH_HOLDER__BATCH_FETCH);
-
-		xmlCacheEClass = createEClass(XML_CACHE);
-		createEAttribute(xmlCacheEClass, XML_CACHE__EXPIRY);
-		createEAttribute(xmlCacheEClass, XML_CACHE__SIZE);
-		createEAttribute(xmlCacheEClass, XML_CACHE__SHARED);
-		createEAttribute(xmlCacheEClass, XML_CACHE__TYPE);
-		createEAttribute(xmlCacheEClass, XML_CACHE__ALWAYS_REFRESH);
-		createEAttribute(xmlCacheEClass, XML_CACHE__REFRESH_ONLY_IF_NEWER);
-		createEAttribute(xmlCacheEClass, XML_CACHE__DISABLE_HITS);
-		createEAttribute(xmlCacheEClass, XML_CACHE__COORDINATION_TYPE);
-		createEReference(xmlCacheEClass, XML_CACHE__EXPIRY_TIME_OF_DAY);
-
-		xmlCacheHolderEClass = createEClass(XML_CACHE_HOLDER);
-		createEReference(xmlCacheHolderEClass, XML_CACHE_HOLDER__CACHE);
-		createEAttribute(xmlCacheHolderEClass, XML_CACHE_HOLDER__EXISTENCE_CHECKING);
-
-		xmlCacheIndexEClass = createEClass(XML_CACHE_INDEX);
-
-		xmlChangeTrackingEClass = createEClass(XML_CHANGE_TRACKING);
-		createEAttribute(xmlChangeTrackingEClass, XML_CHANGE_TRACKING__TYPE);
-
-		xmlChangeTrackingHolderEClass = createEClass(XML_CHANGE_TRACKING_HOLDER);
-		createEReference(xmlChangeTrackingHolderEClass, XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING);
-
-		xmlCloneCopyPolicyEClass = createEClass(XML_CLONE_COPY_POLICY);
-		createEAttribute(xmlCloneCopyPolicyEClass, XML_CLONE_COPY_POLICY__METHOD);
-		createEAttribute(xmlCloneCopyPolicyEClass, XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD);
-
-		xmlCollectionTableEClass = createEClass(XML_COLLECTION_TABLE);
-
-		xmlConversionValueEClass = createEClass(XML_CONVERSION_VALUE);
-		createEAttribute(xmlConversionValueEClass, XML_CONVERSION_VALUE__DATA_VALUE);
-		createEAttribute(xmlConversionValueEClass, XML_CONVERSION_VALUE__OBJECT_VALUE);
-
-		xmlConverterEClass = createEClass(XML_CONVERTER);
-		createEAttribute(xmlConverterEClass, XML_CONVERTER__CLASS_NAME);
-
-		xmlConverterHolderEClass = createEClass(XML_CONVERTER_HOLDER);
-		createEReference(xmlConverterHolderEClass, XML_CONVERTER_HOLDER__CONVERTER);
-		createEReference(xmlConverterHolderEClass, XML_CONVERTER_HOLDER__TYPE_CONVERTER);
-		createEReference(xmlConverterHolderEClass, XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER);
-		createEReference(xmlConverterHolderEClass, XML_CONVERTER_HOLDER__STRUCT_CONVERTER);
-
-		xmlConvertersHolderEClass = createEClass(XML_CONVERTERS_HOLDER);
-		createEReference(xmlConvertersHolderEClass, XML_CONVERTERS_HOLDER__CONVERTERS);
-		createEReference(xmlConvertersHolderEClass, XML_CONVERTERS_HOLDER__TYPE_CONVERTERS);
-		createEReference(xmlConvertersHolderEClass, XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS);
-		createEReference(xmlConvertersHolderEClass, XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS);
-
-		xmlConvertibleMappingEClass = createEClass(XML_CONVERTIBLE_MAPPING);
-		createEAttribute(xmlConvertibleMappingEClass, XML_CONVERTIBLE_MAPPING__CONVERT);
-
-		xmlCopyPolicyEClass = createEClass(XML_COPY_POLICY);
-		createEAttribute(xmlCopyPolicyEClass, XML_COPY_POLICY__CLASS);
-
-		xmlCustomizerEClass = createEClass(XML_CUSTOMIZER);
-		createEAttribute(xmlCustomizerEClass, XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME);
-
-		xmlCustomizerHolderEClass = createEClass(XML_CUSTOMIZER_HOLDER);
-		createEReference(xmlCustomizerHolderEClass, XML_CUSTOMIZER_HOLDER__CUSTOMIZER);
-
-		xmlElementCollectionEClass = createEClass(XML_ELEMENT_COLLECTION);
-
-		xmlEmbeddableEClass = createEClass(XML_EMBEDDABLE);
-		createEReference(xmlEmbeddableEClass, XML_EMBEDDABLE__COPY_POLICY);
-		createEReference(xmlEmbeddableEClass, XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY);
-		createEReference(xmlEmbeddableEClass, XML_EMBEDDABLE__CLONE_COPY_POLICY);
-		createEAttribute(xmlEmbeddableEClass, XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS);
-
-		xmlEmbeddedEClass = createEClass(XML_EMBEDDED);
-
-		xmlEmbeddedIdEClass = createEClass(XML_EMBEDDED_ID);
-
-		xmlEntityEClass = createEClass(XML_ENTITY);
-		createEReference(xmlEntityEClass, XML_ENTITY__OPTIMISTIC_LOCKING);
-		createEReference(xmlEntityEClass, XML_ENTITY__COPY_POLICY);
-		createEReference(xmlEntityEClass, XML_ENTITY__INSTANTIATION_COPY_POLICY);
-		createEReference(xmlEntityEClass, XML_ENTITY__CLONE_COPY_POLICY);
-		createEAttribute(xmlEntityEClass, XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS);
-
-		xmlEntityMappingsEClass = createEClass(XML_ENTITY_MAPPINGS);
-
-		xmlFetchAttributeEClass = createEClass(XML_FETCH_ATTRIBUTE);
-
-		xmlFetchGroupEClass = createEClass(XML_FETCH_GROUP);
-
-		xmlHashPartitioningEClass = createEClass(XML_HASH_PARTITIONING);
-
-		xmlIdEClass = createEClass(XML_ID);
-
-		xmlIndexEClass = createEClass(XML_INDEX);
-
-		xmlInstantiationCopyPolicyEClass = createEClass(XML_INSTANTIATION_COPY_POLICY);
-
-		xmlJoinFetchEClass = createEClass(XML_JOIN_FETCH);
-		createEAttribute(xmlJoinFetchEClass, XML_JOIN_FETCH__JOIN_FETCH);
-
-		xmlJoinTableEClass = createEClass(XML_JOIN_TABLE);
-
-		xmlManyToManyEClass = createEClass(XML_MANY_TO_MANY);
-
-		xmlManyToOneEClass = createEClass(XML_MANY_TO_ONE);
-
-		xmlMappedSuperclassEClass = createEClass(XML_MAPPED_SUPERCLASS);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__COPY_POLICY);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY);
-		createEReference(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY);
-		createEAttribute(xmlMappedSuperclassEClass, XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS);
-
-		xmlMultitenantEClass = createEClass(XML_MULTITENANT);
-
-		xmlMutableEClass = createEClass(XML_MUTABLE);
-		createEAttribute(xmlMutableEClass, XML_MUTABLE__MUTABLE);
-
-		xmlNamedConverterEClass = createEClass(XML_NAMED_CONVERTER);
-		createEAttribute(xmlNamedConverterEClass, XML_NAMED_CONVERTER__NAME);
-
-		xmlNamedPlsqlStoredFunctionQueryEClass = createEClass(XML_NAMED_PLSQL_STORED_FUNCTION_QUERY);
-
-		xmlNamedPlsqlStoredProcedureQueryEClass = createEClass(XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY);
-
-		xmlNamedStoredFunctionQueryEClass = createEClass(XML_NAMED_STORED_FUNCTION_QUERY);
-
-		xmlNamedStoredProcedureQueryEClass = createEClass(XML_NAMED_STORED_PROCEDURE_QUERY);
-		createEAttribute(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__NAME);
-		createEAttribute(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS);
-		createEAttribute(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING);
-		createEAttribute(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME);
-		createEAttribute(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET);
-		createEReference(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__HINTS);
-		createEReference(xmlNamedStoredProcedureQueryEClass, XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS);
-
-		xmlObjectTypeConverterEClass = createEClass(XML_OBJECT_TYPE_CONVERTER);
-		createEAttribute(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__DATA_TYPE);
-		createEAttribute(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE);
-		createEReference(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES);
-		createEAttribute(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE);
-
-		xmlOneToManyEClass = createEClass(XML_ONE_TO_MANY);
-
-		xmlOneToOneEClass = createEClass(XML_ONE_TO_ONE);
-
-		xmlOptimisticLockingEClass = createEClass(XML_OPTIMISTIC_LOCKING);
-		createEAttribute(xmlOptimisticLockingEClass, XML_OPTIMISTIC_LOCKING__TYPE);
-		createEAttribute(xmlOptimisticLockingEClass, XML_OPTIMISTIC_LOCKING__CASCADE);
-		createEReference(xmlOptimisticLockingEClass, XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS);
-
-		xmlOrderColumnEClass = createEClass(XML_ORDER_COLUMN);
-
-		xmlPartitioningEClass = createEClass(XML_PARTITIONING);
-
-		xmlPersistenceUnitDefaultsEClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS);
-
-		xmlPersistenceUnitMetadataEClass = createEClass(XML_PERSISTENCE_UNIT_METADATA);
-		createEAttribute(xmlPersistenceUnitMetadataEClass, XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS);
-
-		xmlPinnedPartitioningEClass = createEClass(XML_PINNED_PARTITIONING);
-
-		xmlPlsqlRecordEClass = createEClass(XML_PLSQL_RECORD);
-
-		xmlPlsqlTableEClass = createEClass(XML_PLSQL_TABLE);
-
-		xmlPrimaryKeyEClass = createEClass(XML_PRIMARY_KEY);
-
-		xmlPrivateOwnedEClass = createEClass(XML_PRIVATE_OWNED);
-		createEAttribute(xmlPrivateOwnedEClass, XML_PRIVATE_OWNED__PRIVATE_OWNED);
-
-		xmlPropertyEClass = createEClass(XML_PROPERTY);
-		createEAttribute(xmlPropertyEClass, XML_PROPERTY__NAME);
-		createEAttribute(xmlPropertyEClass, XML_PROPERTY__VALUE);
-		createEAttribute(xmlPropertyEClass, XML_PROPERTY__VALUE_TYPE);
-
-		xmlPropertyContainerEClass = createEClass(XML_PROPERTY_CONTAINER);
-		createEReference(xmlPropertyContainerEClass, XML_PROPERTY_CONTAINER__PROPERTIES);
-
-		xmlQueryContainerEClass = createEClass(XML_QUERY_CONTAINER);
-		createEReference(xmlQueryContainerEClass, XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES);
-
-		xmlQueryRedirectorsEClass = createEClass(XML_QUERY_REDIRECTORS);
-
-		xmlRangePartitioningEClass = createEClass(XML_RANGE_PARTITIONING);
-
-		xmlReadOnlyEClass = createEClass(XML_READ_ONLY);
-		createEAttribute(xmlReadOnlyEClass, XML_READ_ONLY__READ_ONLY);
-
-		xmlReplicationPartitioningEClass = createEClass(XML_REPLICATION_PARTITIONING);
-
-		xmlReturnInsertEClass = createEClass(XML_RETURN_INSERT);
-
-		xmlRoundRobinPartitioningEClass = createEClass(XML_ROUND_ROBIN_PARTITIONING);
-
-		xmlSecondaryTableEClass = createEClass(XML_SECONDARY_TABLE);
-
-		xmlStoredProcedureParameterEClass = createEClass(XML_STORED_PROCEDURE_PARAMETER);
-		createEAttribute(xmlStoredProcedureParameterEClass, XML_STORED_PROCEDURE_PARAMETER__DIRECTION);
-		createEAttribute(xmlStoredProcedureParameterEClass, XML_STORED_PROCEDURE_PARAMETER__NAME);
-		createEAttribute(xmlStoredProcedureParameterEClass, XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER);
-		createEAttribute(xmlStoredProcedureParameterEClass, XML_STORED_PROCEDURE_PARAMETER__TYPE);
-		createEAttribute(xmlStoredProcedureParameterEClass, XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE);
-		createEAttribute(xmlStoredProcedureParameterEClass, XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE_NAME);
-
-		xmlStructEClass = createEClass(XML_STRUCT);
-
-		xmlStructConverterEClass = createEClass(XML_STRUCT_CONVERTER);
-		createEAttribute(xmlStructConverterEClass, XML_STRUCT_CONVERTER__CONVERTER);
-
-		xmlStructureEClass = createEClass(XML_STRUCTURE);
-
-		xmlTableEClass = createEClass(XML_TABLE);
-
-		xmlTableGeneratorEClass = createEClass(XML_TABLE_GENERATOR);
-
-		xmlTenantDiscriminatorColumnEClass = createEClass(XML_TENANT_DISCRIMINATOR_COLUMN);
-
-		xmlTimeOfDayEClass = createEClass(XML_TIME_OF_DAY);
-		createEAttribute(xmlTimeOfDayEClass, XML_TIME_OF_DAY__HOUR);
-		createEAttribute(xmlTimeOfDayEClass, XML_TIME_OF_DAY__MINUTE);
-		createEAttribute(xmlTimeOfDayEClass, XML_TIME_OF_DAY__SECOND);
-		createEAttribute(xmlTimeOfDayEClass, XML_TIME_OF_DAY__MILLISECOND);
-
-		xmlTransformationEClass = createEClass(XML_TRANSFORMATION);
-
-		xmlTransientEClass = createEClass(XML_TRANSIENT);
-
-		xmlTypeConverterEClass = createEClass(XML_TYPE_CONVERTER);
-		createEAttribute(xmlTypeConverterEClass, XML_TYPE_CONVERTER__DATA_TYPE);
-		createEAttribute(xmlTypeConverterEClass, XML_TYPE_CONVERTER__OBJECT_TYPE);
-
-		xmlUnionPartitioningEClass = createEClass(XML_UNION_PARTITIONING);
-
-		xmlValuePartitioningEClass = createEClass(XML_VALUE_PARTITIONING);
-
-		xmlVariableOneToOneEClass = createEClass(XML_VARIABLE_ONE_TO_ONE);
-
-		xmlVersionEClass = createEClass(XML_VERSION);
-
-		// Create enums
-		cacheCoordinationTypeEEnum = createEEnum(CACHE_COORDINATION_TYPE);
-		cacheTypeEEnum = createEEnum(CACHE_TYPE);
-		xmlChangeTrackingTypeEEnum = createEEnum(XML_CHANGE_TRACKING_TYPE);
-		xmlDirectionEEnum = createEEnum(XML_DIRECTION);
-		existenceTypeEEnum = createEEnum(EXISTENCE_TYPE);
-		xmlJoinFetchTypeEEnum = createEEnum(XML_JOIN_FETCH_TYPE);
-		xmlOptimisticLockingTypeEEnum = createEEnum(XML_OPTIMISTIC_LOCKING_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents()
-	{
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI);
-		EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI);
-		EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI);
-		EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI);
-		EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI);
-		EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI);
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-		OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
-
-		// Add subpackages
-		getESubpackages().add(theEclipseLinkOrmV1_1Package);
-		getESubpackages().add(theEclipseLinkOrmV2_0Package);
-		getESubpackages().add(theEclipseLinkOrmV2_1Package);
-		getESubpackages().add(theEclipseLinkOrmV2_2Package);
-		getESubpackages().add(theEclipseLinkOrmV2_3Package);
-		getESubpackages().add(theEclipseLinkOrmV2_4Package);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		xmlAdditionalCriteriaEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlAdditionalCriteria_2_2());
-		xmlArrayEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlArrayEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlArrayEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlArray_2_3());
-		xmlAttributeMappingEClass.getESuperTypes().add(theOrmPackage.getXmlAttributeMapping());
-		xmlAttributeMappingEClass.getESuperTypes().add(this.getXmlAccessMethodsHolder());
-		xmlAttributeMappingEClass.getESuperTypes().add(this.getXmlPropertyContainer());
-		attributesEClass.getESuperTypes().add(theOrmPackage.getAttributes());
-		attributesEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlAttributes_2_3());
-		xmlBasicEClass.getESuperTypes().add(theOrmPackage.getXmlBasic());
-		xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlBasic_1_1());
-		xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlBasic_2_1());
-		xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlBasic_2_2());
-		xmlBasicEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlBasic_2_4());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlMutable());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-		xmlBasicCollectionEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlBasicCollectionEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlBasicCollectionEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlBasicCollection_2_2());
-		xmlBasicMapEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlBasicMapEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlBasicMapEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlBasicMap_2_2());
-		xmlBatchFetchEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlBatchFetch_2_1());
-		xmlCacheIndexEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlCacheIndex_2_4());
-		xmlCollectionTableEClass.getESuperTypes().add(theOrmPackage.getXmlCollectionTable());
-		xmlCollectionTableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlCollectionTable_2_2());
-		xmlConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
-		xmlConvertibleMappingEClass.getESuperTypes().add(theOrmPackage.getXmlConvertibleMapping());
-		xmlConvertibleMappingEClass.getESuperTypes().add(this.getXmlConverterHolder());
-		xmlElementCollectionEClass.getESuperTypes().add(theOrmPackage.getXmlElementCollection());
-		xmlElementCollectionEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlElementCollection_2_0());
-		xmlElementCollectionEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlElementCollection_2_1());
-		xmlElementCollectionEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlElementCollection_2_2());
-		xmlElementCollectionEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlElementCollection_2_3());
-		xmlElementCollectionEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlElementCollection_2_4());
-		xmlEmbeddableEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddable());
-		xmlEmbeddableEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEmbeddable_2_1());
-		xmlEmbeddableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlEmbeddable_2_2());
-		xmlEmbeddableEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlEmbeddable_2_3());
-		xmlEmbeddableEClass.getESuperTypes().add(this.getXmlCustomizerHolder());
-		xmlEmbeddableEClass.getESuperTypes().add(this.getXmlChangeTrackingHolder());
-		xmlEmbeddableEClass.getESuperTypes().add(this.getXmlConvertersHolder());
-		xmlEmbeddableEClass.getESuperTypes().add(this.getXmlPropertyContainer());
-		xmlEmbeddedEClass.getESuperTypes().add(theOrmPackage.getXmlEmbedded());
-		xmlEmbeddedEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEmbedded_2_1());
-		xmlEmbeddedEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlEmbeddedIdEClass.getESuperTypes().add(theOrmPackage.getXmlEmbeddedId());
-		xmlEmbeddedIdEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEmbeddedId_2_1());
-		xmlEmbeddedIdEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlEntityEClass.getESuperTypes().add(theOrmPackage.getXmlEntity());
-		xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlEntity_1_1());
-		xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlEntity_2_0());
-		xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEntity_2_1());
-		xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlEntity_2_2());
-		xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlEntity_2_3());
-		xmlEntityEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlEntity_2_4());
-		xmlEntityEClass.getESuperTypes().add(this.getXmlReadOnly());
-		xmlEntityEClass.getESuperTypes().add(this.getXmlCustomizerHolder());
-		xmlEntityEClass.getESuperTypes().add(this.getXmlChangeTrackingHolder());
-		xmlEntityEClass.getESuperTypes().add(this.getXmlCacheHolder());
-		xmlEntityEClass.getESuperTypes().add(this.getXmlConvertersHolder());
-		xmlEntityEClass.getESuperTypes().add(this.getXmlQueryContainer());
-		xmlEntityEClass.getESuperTypes().add(this.getXmlPropertyContainer());
-		xmlEntityMappingsEClass.getESuperTypes().add(theOrmPackage.getXmlEntityMappings());
-		xmlEntityMappingsEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlEntityMappings_2_1());
-		xmlEntityMappingsEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlEntityMappings_2_2());
-		xmlEntityMappingsEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlEntityMappings_2_3());
-		xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlConvertersHolder());
-		xmlEntityMappingsEClass.getESuperTypes().add(this.getXmlQueryContainer());
-		xmlFetchAttributeEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlFetchAttribute_2_1());
-		xmlFetchGroupEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlFetchGroup_2_1());
-		xmlHashPartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlHashPartitioning_2_2());
-		xmlIdEClass.getESuperTypes().add(theOrmPackage.getXmlId());
-		xmlIdEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlId_2_1());
-		xmlIdEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlId_2_2());
-		xmlIdEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlId_2_4());
-		xmlIdEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlIdEClass.getESuperTypes().add(this.getXmlMutable());
-		xmlIdEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-		xmlIndexEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlIndex_2_2());
-		xmlJoinTableEClass.getESuperTypes().add(theOrmPackage.getXmlJoinTable());
-		xmlJoinTableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlJoinTable_2_2());
-		xmlManyToManyEClass.getESuperTypes().add(theOrmPackage.getXmlManyToMany());
-		xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlManyToMany_2_0());
-		xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlManyToMany_2_1());
-		xmlManyToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlManyToMany_2_2());
-		xmlManyToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlManyToManyEClass.getESuperTypes().add(this.getXmlJoinFetch());
-		xmlManyToOneEClass.getESuperTypes().add(theOrmPackage.getXmlManyToOne());
-		xmlManyToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlManyToOne_2_1());
-		xmlManyToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlManyToOne_2_2());
-		xmlManyToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlManyToOneEClass.getESuperTypes().add(this.getXmlJoinFetch());
-		xmlMappedSuperclassEClass.getESuperTypes().add(theOrmPackage.getXmlMappedSuperclass());
-		xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlMappedSuperclass_1_1());
-		xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlMappedSuperclass_2_0());
-		xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlMappedSuperclass_2_1());
-		xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlMappedSuperclass_2_2());
-		xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlMappedSuperclass_2_3());
-		xmlMappedSuperclassEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlMappedSuperclass_2_4());
-		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlReadOnly());
-		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlCustomizerHolder());
-		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlChangeTrackingHolder());
-		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlCacheHolder());
-		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlConvertersHolder());
-		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlPropertyContainer());
-		xmlMultitenantEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlMultitenant_2_3());
-		xmlMultitenantEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlMultitenant_2_4());
-		xmlNamedPlsqlStoredFunctionQueryEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlNamedPlsqlStoredFunctionQuery_2_3());
-		xmlNamedPlsqlStoredProcedureQueryEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlNamedPlsqlStoredProcedureQuery_2_3());
-		xmlNamedStoredFunctionQueryEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlNamedStoredFunctionQuery_2_3());
-		xmlObjectTypeConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
-		xmlOneToManyEClass.getESuperTypes().add(theOrmPackage.getXmlOneToMany());
-		xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOneToMany_2_0());
-		xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlOneToMany_2_1());
-		xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlOneToMany_2_2());
-		xmlOneToManyEClass.getESuperTypes().add(theEclipseLinkOrmV2_4Package.getXmlOneToMany_2_4());
-		xmlOneToManyEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlOneToManyEClass.getESuperTypes().add(this.getXmlPrivateOwned());
-		xmlOneToManyEClass.getESuperTypes().add(this.getXmlJoinFetch());
-		xmlOneToOneEClass.getESuperTypes().add(theOrmPackage.getXmlOneToOne());
-		xmlOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlOneToOne_2_1());
-		xmlOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlOneToOne_2_2());
-		xmlOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlOneToOneEClass.getESuperTypes().add(this.getXmlPrivateOwned());
-		xmlOneToOneEClass.getESuperTypes().add(this.getXmlJoinFetch());
-		xmlOrderColumnEClass.getESuperTypes().add(theOrmPackage.getXmlOrderColumn());
-		xmlOrderColumnEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlOrderColumn_2_0());
-		xmlPartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlPartitioning_2_2());
-		xmlPersistenceUnitDefaultsEClass.getESuperTypes().add(theOrmPackage.getXmlPersistenceUnitDefaults());
-		xmlPersistenceUnitDefaultsEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlPersistenceUnitDefaults_2_1());
-		xmlPersistenceUnitDefaultsEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlPersistenceUnitDefaults_2_3());
-		xmlPersistenceUnitMetadataEClass.getESuperTypes().add(theOrmPackage.getXmlPersistenceUnitMetadata());
-		xmlPinnedPartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlPinnedPartitioning_2_2());
-		xmlPlsqlRecordEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlPlsqlRecord_2_3());
-		xmlPlsqlTableEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlPlsqlTable_2_3());
-		xmlPrimaryKeyEClass.getESuperTypes().add(theEclipseLinkOrmV1_1Package.getXmlPrimaryKey_1_1());
-		xmlPrimaryKeyEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlPrimaryKey_2_1());
-		xmlQueryRedirectorsEClass.getESuperTypes().add(theEclipseLinkOrmV2_0Package.getXmlQueryRedirectors_2_0());
-		xmlRangePartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlRangePartitioning_2_2());
-		xmlReplicationPartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlReplicationPartitioning_2_2());
-		xmlReturnInsertEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlReturnInsert_2_1());
-		xmlRoundRobinPartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlRoundRobinPartitioning_2_2());
-		xmlSecondaryTableEClass.getESuperTypes().add(theOrmPackage.getXmlSecondaryTable());
-		xmlSecondaryTableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlSecondaryTable_2_2());
-		xmlStructEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlStruct_2_3());
-		xmlStructConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
-		xmlStructureEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlStructureEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlStructureEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlStructure_2_3());
-		xmlTableEClass.getESuperTypes().add(theOrmPackage.getXmlTable());
-		xmlTableEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlTable_2_2());
-		xmlTableGeneratorEClass.getESuperTypes().add(theOrmPackage.getXmlTableGenerator());
-		xmlTableGeneratorEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlTableGenerator_2_2());
-		xmlTenantDiscriminatorColumnEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlBaseDiscriminatorColumn());
-		xmlTenantDiscriminatorColumnEClass.getESuperTypes().add(theEclipseLinkOrmV2_3Package.getXmlTenantDiscriminatorColumn_2_3());
-		xmlTransformationEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlTransformationEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlTransformation_2_1());
-		xmlTransformationEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlTransientEClass.getESuperTypes().add(theOrmPackage.getXmlTransient());
-		xmlTransientEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlTypeConverterEClass.getESuperTypes().add(this.getXmlNamedConverter());
-		xmlUnionPartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlUnionPartitioning_2_2());
-		xmlValuePartitioningEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlValuePartitioning_2_2());
-		xmlVariableOneToOneEClass.getESuperTypes().add(theOrmPackage.getAbstractXmlAttributeMapping());
-		xmlVariableOneToOneEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlVariableOneToOneEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlVariableOneToOne_2_2());
-		xmlVersionEClass.getESuperTypes().add(theOrmPackage.getXmlVersion());
-		xmlVersionEClass.getESuperTypes().add(theEclipseLinkOrmV2_1Package.getXmlVersion_2_1());
-		xmlVersionEClass.getESuperTypes().add(theEclipseLinkOrmV2_2Package.getXmlVersion_2_2());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlAttributeMapping());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlMutable());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlAccessMethodsEClass, XmlAccessMethods.class, "XmlAccessMethods", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlAccessMethods_GetMethod(), theXMLTypePackage.getString(), "getMethod", null, 0, 1, XmlAccessMethods.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlAccessMethods_SetMethod(), theXMLTypePackage.getString(), "setMethod", null, 0, 1, XmlAccessMethods.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlAccessMethodsHolderEClass, XmlAccessMethodsHolder.class, "XmlAccessMethodsHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlAccessMethodsHolder_AccessMethods(), this.getXmlAccessMethods(), null, "accessMethods", null, 0, 1, XmlAccessMethodsHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlAdditionalCriteriaEClass, XmlAdditionalCriteria.class, "XmlAdditionalCriteria", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlArrayEClass, XmlArray.class, "XmlArray", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlAttributeMappingEClass, XmlAttributeMapping.class, "XmlAttributeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(attributesEClass, Attributes.class, "Attributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAttributes_BasicCollections(), this.getXmlBasicCollection(), null, "basicCollections", null, 0, -1, Attributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAttributes_BasicMaps(), this.getXmlBasicMap(), null, "basicMaps", null, 0, -1, Attributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAttributes_Transformations(), this.getXmlTransformation(), null, "transformations", null, 0, -1, Attributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAttributes_VariableOneToOnes(), this.getXmlVariableOneToOne(), null, "variableOneToOnes", null, 0, -1, Attributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasicEClass, XmlBasic.class, "XmlBasic", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicCollectionEClass, XmlBasicCollection.class, "XmlBasicCollection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBasicMapEClass, XmlBasicMap.class, "XmlBasicMap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBatchFetchEClass, XmlBatchFetch.class, "XmlBatchFetch", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlBatchFetchHolderEClass, XmlBatchFetchHolder.class, "XmlBatchFetchHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBatchFetchHolder_BatchFetch(), this.getXmlBatchFetch(), null, "batchFetch", null, 0, 1, XmlBatchFetchHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCacheEClass, XmlCache.class, "XmlCache", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlCache_Expiry(), theXMLTypePackage.getIntObject(), "expiry", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCache_Size(), theXMLTypePackage.getIntObject(), "size", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCache_Shared(), theXMLTypePackage.getBooleanObject(), "shared", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCache_Type(), this.getCacheType(), "type", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCache_AlwaysRefresh(), theXMLTypePackage.getBooleanObject(), "alwaysRefresh", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCache_RefreshOnlyIfNewer(), theXMLTypePackage.getBooleanObject(), "refreshOnlyIfNewer", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCache_DisableHits(), theXMLTypePackage.getBooleanObject(), "disableHits", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCache_CoordinationType(), this.getCacheCoordinationType(), "coordinationType", "", 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlCache_ExpiryTimeOfDay(), this.getXmlTimeOfDay(), null, "expiryTimeOfDay", null, 0, 1, XmlCache.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCacheHolderEClass, XmlCacheHolder.class, "XmlCacheHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlCacheHolder_Cache(), this.getXmlCache(), null, "cache", null, 0, 1, XmlCacheHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCacheHolder_ExistenceChecking(), this.getExistenceType(), "existenceChecking", "", 0, 1, XmlCacheHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCacheIndexEClass, XmlCacheIndex.class, "XmlCacheIndex", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlChangeTrackingEClass, XmlChangeTracking.class, "XmlChangeTracking", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlChangeTracking_Type(), this.getXmlChangeTrackingType(), "type", null, 0, 1, XmlChangeTracking.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlChangeTrackingHolderEClass, XmlChangeTrackingHolder.class, "XmlChangeTrackingHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlChangeTrackingHolder_ChangeTracking(), this.getXmlChangeTracking(), null, "changeTracking", null, 0, 1, XmlChangeTrackingHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCloneCopyPolicyEClass, XmlCloneCopyPolicy.class, "XmlCloneCopyPolicy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlCloneCopyPolicy_Method(), theXMLTypePackage.getString(), "method", null, 0, 1, XmlCloneCopyPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlCloneCopyPolicy_WorkingCopyMethod(), theXMLTypePackage.getString(), "workingCopyMethod", null, 0, 1, XmlCloneCopyPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCollectionTableEClass, XmlCollectionTable.class, "XmlCollectionTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlConversionValueEClass, XmlConversionValue.class, "XmlConversionValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlConversionValue_DataValue(), theXMLTypePackage.getString(), "dataValue", null, 0, 1, XmlConversionValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlConversionValue_ObjectValue(), theXMLTypePackage.getString(), "objectValue", null, 0, 1, XmlConversionValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlConverterEClass, XmlConverter.class, "XmlConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlConverter_ClassName(), theXMLTypePackage.getString(), "className", null, 0, 1, XmlConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlConverterHolderEClass, XmlConverterHolder.class, "XmlConverterHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlConverterHolder_Converter(), this.getXmlConverter(), null, "converter", null, 0, 1, XmlConverterHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlConverterHolder_TypeConverter(), this.getXmlTypeConverter(), null, "typeConverter", null, 0, 1, XmlConverterHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlConverterHolder_ObjectTypeConverter(), this.getXmlObjectTypeConverter(), null, "objectTypeConverter", null, 0, 1, XmlConverterHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlConverterHolder_StructConverter(), this.getXmlStructConverter(), null, "structConverter", null, 0, 1, XmlConverterHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlConvertersHolderEClass, XmlConvertersHolder.class, "XmlConvertersHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlConvertersHolder_Converters(), this.getXmlConverter(), null, "converters", null, 0, -1, XmlConvertersHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlConvertersHolder_TypeConverters(), this.getXmlTypeConverter(), null, "typeConverters", null, 0, -1, XmlConvertersHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlConvertersHolder_ObjectTypeConverters(), this.getXmlObjectTypeConverter(), null, "objectTypeConverters", null, 0, -1, XmlConvertersHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlConvertersHolder_StructConverters(), this.getXmlStructConverter(), null, "structConverters", null, 0, -1, XmlConvertersHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlConvertibleMappingEClass, XmlConvertibleMapping.class, "XmlConvertibleMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlConvertibleMapping_Convert(), theXMLTypePackage.getString(), "convert", null, 0, 1, XmlConvertibleMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCopyPolicyEClass, XmlCopyPolicy.class, "XmlCopyPolicy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlCopyPolicy_Class(), theXMLTypePackage.getString(), "class", null, 0, 1, XmlCopyPolicy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCustomizerEClass, XmlCustomizer.class, "XmlCustomizer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlCustomizer_CustomizerClassName(), theXMLTypePackage.getString(), "customizerClassName", null, 0, 1, XmlCustomizer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCustomizerHolderEClass, XmlCustomizerHolder.class, "XmlCustomizerHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlCustomizerHolder_Customizer(), theOrmPackage.getXmlClassReference(), null, "customizer", null, 0, 1, XmlCustomizerHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlElementCollectionEClass, XmlElementCollection.class, "XmlElementCollection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbeddableEClass, XmlEmbeddable.class, "XmlEmbeddable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEmbeddable_CopyPolicy(), this.getXmlCopyPolicy(), null, "copyPolicy", null, 0, 1, XmlEmbeddable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEmbeddable_InstantiationCopyPolicy(), this.getXmlInstantiationCopyPolicy(), null, "instantiationCopyPolicy", null, 0, 1, XmlEmbeddable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEmbeddable_CloneCopyPolicy(), this.getXmlCloneCopyPolicy(), null, "cloneCopyPolicy", null, 0, 1, XmlEmbeddable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEmbeddable_ExcludeDefaultMappings(), theXMLTypePackage.getBooleanObject(), "excludeDefaultMappings", null, 0, 1, XmlEmbeddable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEmbeddedEClass, XmlEmbedded.class, "XmlEmbedded", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbeddedIdEClass, XmlEmbeddedId.class, "XmlEmbeddedId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEntityEClass, XmlEntity.class, "XmlEntity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntity_OptimisticLocking(), this.getXmlOptimisticLocking(), null, "optimisticLocking", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_CopyPolicy(), this.getXmlCopyPolicy(), null, "copyPolicy", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_InstantiationCopyPolicy(), this.getXmlInstantiationCopyPolicy(), null, "instantiationCopyPolicy", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_CloneCopyPolicy(), this.getXmlCloneCopyPolicy(), null, "cloneCopyPolicy", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntity_ExcludeDefaultMappings(), theXMLTypePackage.getBooleanObject(), "excludeDefaultMappings", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntityMappingsEClass, XmlEntityMappings.class, "XmlEntityMappings", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlFetchAttributeEClass, XmlFetchAttribute.class, "XmlFetchAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlFetchGroupEClass, XmlFetchGroup.class, "XmlFetchGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlHashPartitioningEClass, XmlHashPartitioning.class, "XmlHashPartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlIdEClass, XmlId.class, "XmlId", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlIndexEClass, XmlIndex.class, "XmlIndex", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlInstantiationCopyPolicyEClass, XmlInstantiationCopyPolicy.class, "XmlInstantiationCopyPolicy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlJoinFetchEClass, XmlJoinFetch.class, "XmlJoinFetch", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlJoinFetch_JoinFetch(), this.getXmlJoinFetchType(), "joinFetch", null, 0, 1, XmlJoinFetch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlJoinTableEClass, XmlJoinTable.class, "XmlJoinTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlManyToManyEClass, XmlManyToMany.class, "XmlManyToMany", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlManyToOneEClass, XmlManyToOne.class, "XmlManyToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlMappedSuperclassEClass, XmlMappedSuperclass.class, "XmlMappedSuperclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMappedSuperclass_OptimisticLocking(), this.getXmlOptimisticLocking(), null, "optimisticLocking", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_CopyPolicy(), this.getXmlCopyPolicy(), null, "copyPolicy", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_InstantiationCopyPolicy(), this.getXmlInstantiationCopyPolicy(), null, "instantiationCopyPolicy", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_CloneCopyPolicy(), this.getXmlCloneCopyPolicy(), null, "cloneCopyPolicy", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlMappedSuperclass_ExcludeDefaultMappings(), theXMLTypePackage.getBooleanObject(), "excludeDefaultMappings", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMultitenantEClass, XmlMultitenant.class, "XmlMultitenant", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlMutableEClass, XmlMutable.class, "XmlMutable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlMutable_Mutable(), theXMLTypePackage.getBooleanObject(), "mutable", null, 0, 1, XmlMutable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlNamedConverterEClass, XmlNamedConverter.class, "XmlNamedConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlNamedConverter_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlNamedPlsqlStoredFunctionQueryEClass, XmlNamedPlsqlStoredFunctionQuery.class, "XmlNamedPlsqlStoredFunctionQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlNamedPlsqlStoredProcedureQueryEClass, XmlNamedPlsqlStoredProcedureQuery.class, "XmlNamedPlsqlStoredProcedureQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlNamedStoredFunctionQueryEClass, XmlNamedStoredFunctionQuery.class, "XmlNamedStoredFunctionQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlNamedStoredProcedureQueryEClass, XmlNamedStoredProcedureQuery.class, "XmlNamedStoredProcedureQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlNamedStoredProcedureQuery_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlNamedStoredProcedureQuery_ResultClass(), theXMLTypePackage.getString(), "resultClass", null, 0, 1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlNamedStoredProcedureQuery_ResultSetMapping(), theXMLTypePackage.getString(), "resultSetMapping", null, 0, 1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlNamedStoredProcedureQuery_ProcedureName(), theXMLTypePackage.getString(), "procedureName", null, 0, 1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlNamedStoredProcedureQuery_ReturnsResultSet(), theXMLTypePackage.getBooleanObject(), "returnsResultSet", null, 0, 1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlNamedStoredProcedureQuery_Hints(), theOrmPackage.getXmlQueryHint(), null, "hints", null, 0, -1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlNamedStoredProcedureQuery_Parameters(), this.getXmlStoredProcedureParameter(), null, "parameters", null, 0, -1, XmlNamedStoredProcedureQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlObjectTypeConverterEClass, XmlObjectTypeConverter.class, "XmlObjectTypeConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlObjectTypeConverter_DataType(), theXMLTypePackage.getString(), "dataType", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlObjectTypeConverter_ObjectType(), theXMLTypePackage.getString(), "objectType", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlObjectTypeConverter_ConversionValues(), this.getXmlConversionValue(), null, "conversionValues", null, 0, -1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlObjectTypeConverter_DefaultObjectValue(), theXMLTypePackage.getString(), "defaultObjectValue", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToManyEClass, XmlOneToMany.class, "XmlOneToMany", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlOneToOneEClass, XmlOneToOne.class, "XmlOneToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlOptimisticLockingEClass, XmlOptimisticLocking.class, "XmlOptimisticLocking", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlOptimisticLocking_Type(), this.getXmlOptimisticLockingType(), "type", null, 0, 1, XmlOptimisticLocking.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlOptimisticLocking_Cascade(), theXMLTypePackage.getBooleanObject(), "cascade", null, 0, 1, XmlOptimisticLocking.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlOptimisticLocking_SelectedColumns(), theOrmPackage.getXmlColumn(), null, "selectedColumns", null, 0, -1, XmlOptimisticLocking.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOrderColumnEClass, XmlOrderColumn.class, "XmlOrderColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPartitioningEClass, XmlPartitioning.class, "XmlPartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPersistenceUnitDefaultsEClass, XmlPersistenceUnitDefaults.class, "XmlPersistenceUnitDefaults", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPersistenceUnitMetadataEClass, XmlPersistenceUnitMetadata.class, "XmlPersistenceUnitMetadata", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPersistenceUnitMetadata_ExcludeDefaultMappings(), theXMLTypePackage.getBoolean(), "excludeDefaultMappings", null, 0, 1, XmlPersistenceUnitMetadata.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPinnedPartitioningEClass, XmlPinnedPartitioning.class, "XmlPinnedPartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPlsqlRecordEClass, XmlPlsqlRecord.class, "XmlPlsqlRecord", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPlsqlTableEClass, XmlPlsqlTable.class, "XmlPlsqlTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPrimaryKeyEClass, XmlPrimaryKey.class, "XmlPrimaryKey", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPrivateOwnedEClass, XmlPrivateOwned.class, "XmlPrivateOwned", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPrivateOwned_PrivateOwned(), theXMLTypePackage.getBoolean(), "privateOwned", null, 0, 1, XmlPrivateOwned.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPropertyEClass, XmlProperty.class, "XmlProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlProperty_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlProperty_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, XmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlProperty_ValueType(), theXMLTypePackage.getString(), "valueType", null, 0, 1, XmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPropertyContainerEClass, XmlPropertyContainer.class, "XmlPropertyContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlPropertyContainer_Properties(), this.getXmlProperty(), null, "properties", null, 0, -1, XmlPropertyContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlQueryContainerEClass, XmlQueryContainer.class, "XmlQueryContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlQueryContainer_NamedStoredProcedureQueries(), this.getXmlNamedStoredProcedureQuery(), null, "namedStoredProcedureQueries", null, 0, -1, XmlQueryContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlQueryRedirectorsEClass, XmlQueryRedirectors.class, "XmlQueryRedirectors", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlRangePartitioningEClass, XmlRangePartitioning.class, "XmlRangePartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlReadOnlyEClass, XmlReadOnly.class, "XmlReadOnly", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlReadOnly_ReadOnly(), theXMLTypePackage.getBooleanObject(), "readOnly", null, 0, 1, XmlReadOnly.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlReplicationPartitioningEClass, XmlReplicationPartitioning.class, "XmlReplicationPartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlReturnInsertEClass, XmlReturnInsert.class, "XmlReturnInsert", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlRoundRobinPartitioningEClass, XmlRoundRobinPartitioning.class, "XmlRoundRobinPartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlSecondaryTableEClass, XmlSecondaryTable.class, "XmlSecondaryTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlStoredProcedureParameterEClass, XmlStoredProcedureParameter.class, "XmlStoredProcedureParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlStoredProcedureParameter_Direction(), this.getXmlDirection(), "direction", null, 0, 1, XmlStoredProcedureParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlStoredProcedureParameter_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlStoredProcedureParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlStoredProcedureParameter_QueryParameter(), theXMLTypePackage.getString(), "queryParameter", null, 0, 1, XmlStoredProcedureParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlStoredProcedureParameter_Type(), theXMLTypePackage.getString(), "type", null, 0, 1, XmlStoredProcedureParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlStoredProcedureParameter_JdbcType(), theXMLTypePackage.getIntObject(), "jdbcType", null, 0, 1, XmlStoredProcedureParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlStoredProcedureParameter_JdbcTypeName(), theXMLTypePackage.getString(), "jdbcTypeName", null, 0, 1, XmlStoredProcedureParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlStructEClass, XmlStruct.class, "XmlStruct", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlStructConverterEClass, XmlStructConverter.class, "XmlStructConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlStructConverter_Converter(), theXMLTypePackage.getString(), "converter", null, 0, 1, XmlStructConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlStructureEClass, XmlStructure.class, "XmlStructure", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTableEClass, XmlTable.class, "XmlTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTableGeneratorEClass, XmlTableGenerator.class, "XmlTableGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTenantDiscriminatorColumnEClass, XmlTenantDiscriminatorColumn.class, "XmlTenantDiscriminatorColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTimeOfDayEClass, XmlTimeOfDay.class, "XmlTimeOfDay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTimeOfDay_Hour(), theXMLTypePackage.getIntObject(), "hour", null, 0, 1, XmlTimeOfDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTimeOfDay_Minute(), theXMLTypePackage.getIntObject(), "minute", null, 0, 1, XmlTimeOfDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTimeOfDay_Second(), theXMLTypePackage.getIntObject(), "second", null, 0, 1, XmlTimeOfDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTimeOfDay_Millisecond(), theXMLTypePackage.getIntObject(), "millisecond", null, 0, 1, XmlTimeOfDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTransformationEClass, XmlTransformation.class, "XmlTransformation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTransientEClass, XmlTransient.class, "XmlTransient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlTypeConverterEClass, XmlTypeConverter.class, "XmlTypeConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTypeConverter_DataType(), theXMLTypePackage.getString(), "dataType", null, 0, 1, XmlTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTypeConverter_ObjectType(), theXMLTypePackage.getString(), "objectType", null, 0, 1, XmlTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlUnionPartitioningEClass, XmlUnionPartitioning.class, "XmlUnionPartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlValuePartitioningEClass, XmlValuePartitioning.class, "XmlValuePartitioning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlVariableOneToOneEClass, XmlVariableOneToOne.class, "XmlVariableOneToOne", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlVersionEClass, XmlVersion.class, "XmlVersion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize enums and add enum literals
-		initEEnum(cacheCoordinationTypeEEnum, CacheCoordinationType.class, "CacheCoordinationType");
-		addEEnumLiteral(cacheCoordinationTypeEEnum, CacheCoordinationType.SEND_OBJECT_CHANGES);
-		addEEnumLiteral(cacheCoordinationTypeEEnum, CacheCoordinationType.INVALIDATE_CHANGED_OBJECTS);
-		addEEnumLiteral(cacheCoordinationTypeEEnum, CacheCoordinationType.SEND_NEW_OBJECTS_WITH_CHANGES);
-		addEEnumLiteral(cacheCoordinationTypeEEnum, CacheCoordinationType.NONE);
-
-		initEEnum(cacheTypeEEnum, CacheType.class, "CacheType");
-		addEEnumLiteral(cacheTypeEEnum, CacheType.FULL);
-		addEEnumLiteral(cacheTypeEEnum, CacheType.WEAK);
-		addEEnumLiteral(cacheTypeEEnum, CacheType.SOFT);
-		addEEnumLiteral(cacheTypeEEnum, CacheType.SOFT_WEAK);
-		addEEnumLiteral(cacheTypeEEnum, CacheType.HARD_WEAK);
-		addEEnumLiteral(cacheTypeEEnum, CacheType.CACHE);
-		addEEnumLiteral(cacheTypeEEnum, CacheType.NONE);
-
-		initEEnum(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.class, "XmlChangeTrackingType");
-		addEEnumLiteral(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.ATTRIBUTE);
-		addEEnumLiteral(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.OBJECT);
-		addEEnumLiteral(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.DEFERRED);
-		addEEnumLiteral(xmlChangeTrackingTypeEEnum, XmlChangeTrackingType.AUTO);
-
-		initEEnum(xmlDirectionEEnum, XmlDirection.class, "XmlDirection");
-		addEEnumLiteral(xmlDirectionEEnum, XmlDirection.IN);
-		addEEnumLiteral(xmlDirectionEEnum, XmlDirection.OUT);
-		addEEnumLiteral(xmlDirectionEEnum, XmlDirection.IN_OUT);
-		addEEnumLiteral(xmlDirectionEEnum, XmlDirection.OUT_CURSOR);
-
-		initEEnum(existenceTypeEEnum, ExistenceType.class, "ExistenceType");
-		addEEnumLiteral(existenceTypeEEnum, ExistenceType.CHECK_CACHE);
-		addEEnumLiteral(existenceTypeEEnum, ExistenceType.CHECK_DATABASE);
-		addEEnumLiteral(existenceTypeEEnum, ExistenceType.ASSUME_EXISTENCE);
-		addEEnumLiteral(existenceTypeEEnum, ExistenceType.ASSUME_NON_EXISTENCE);
-
-		initEEnum(xmlJoinFetchTypeEEnum, XmlJoinFetchType.class, "XmlJoinFetchType");
-		addEEnumLiteral(xmlJoinFetchTypeEEnum, XmlJoinFetchType.INNER);
-		addEEnumLiteral(xmlJoinFetchTypeEEnum, XmlJoinFetchType.OUTER);
-
-		initEEnum(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.class, "XmlOptimisticLockingType");
-		addEEnumLiteral(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.ALL_COLUMNS);
-		addEEnumLiteral(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.CHANGED_COLUMNS);
-		addEEnumLiteral(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.SELECTED_COLUMNS);
-		addEEnumLiteral(xmlOptimisticLockingTypeEEnum, XmlOptimisticLockingType.VERSION_COLUMN);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-	/**
-	 * <!-- 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.jpa.eclipselink.core.resource.orm.XmlAccessMethods <em>Xml Access Methods</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethods()
-		 * @generated
-		 */
-		public static final EClass XML_ACCESS_METHODS = eINSTANCE.getXmlAccessMethods();
-
-		/**
-		 * 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 XML_ACCESS_METHODS__GET_METHOD = eINSTANCE.getXmlAccessMethods_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 XML_ACCESS_METHODS__SET_METHOD = eINSTANCE.getXmlAccessMethods_SetMethod();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder <em>Xml Access Methods Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder()
-		 * @generated
-		 */
-		public static final EClass XML_ACCESS_METHODS_HOLDER = eINSTANCE.getXmlAccessMethodsHolder();
-
-		/**
-		 * The meta object literal for the '<em><b>Access Methods</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS = eINSTANCE.getXmlAccessMethodsHolder_AccessMethods();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria <em>Xml Additional Criteria</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAdditionalCriteria()
-		 * @generated
-		 */
-		public static final EClass XML_ADDITIONAL_CRITERIA = eINSTANCE.getXmlAdditionalCriteria();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray <em>Xml Array</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlArray()
-		 * @generated
-		 */
-		public static final EClass XML_ARRAY = eINSTANCE.getXmlArray();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAttributeMapping()
-		 * @generated
-		 */
-		public static final EClass XML_ATTRIBUTE_MAPPING = eINSTANCE.getXmlAttributeMapping();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes <em>Attributes</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.Attributes
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getAttributes()
-		 * @generated
-		 */
-		public static final EClass ATTRIBUTES = eINSTANCE.getAttributes();
-
-		/**
-		 * The meta object literal for the '<em><b>Basic Collections</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__BASIC_COLLECTIONS = eINSTANCE.getAttributes_BasicCollections();
-
-		/**
-		 * The meta object literal for the '<em><b>Basic Maps</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__BASIC_MAPS = eINSTANCE.getAttributes_BasicMaps();
-
-		/**
-		 * The meta object literal for the '<em><b>Transformations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__TRANSFORMATIONS = eINSTANCE.getAttributes_Transformations();
-
-		/**
-		 * The meta object literal for the '<em><b>Variable One To Ones</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference ATTRIBUTES__VARIABLE_ONE_TO_ONES = eINSTANCE.getAttributes_VariableOneToOnes();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC = eINSTANCE.getXmlBasic();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_COLLECTION = eINSTANCE.getXmlBasicCollection();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_MAP = eINSTANCE.getXmlBasicMap();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetch <em>Xml Batch Fetch</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetch
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch()
-		 * @generated
-		 */
-		public static final EClass XML_BATCH_FETCH = eINSTANCE.getXmlBatchFetch();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder <em>Xml Batch Fetch Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder()
-		 * @generated
-		 */
-		public static final EClass XML_BATCH_FETCH_HOLDER = eINSTANCE.getXmlBatchFetchHolder();
-
-		/**
-		 * The meta object literal for the '<em><b>Batch Fetch</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_BATCH_FETCH_HOLDER__BATCH_FETCH = eINSTANCE.getXmlBatchFetchHolder_BatchFetch();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache <em>Xml Cache</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache()
-		 * @generated
-		 */
-		public static final EClass XML_CACHE = eINSTANCE.getXmlCache();
-
-		/**
-		 * The meta object literal for the '<em><b>Expiry</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE__EXPIRY = eINSTANCE.getXmlCache_Expiry();
-
-		/**
-		 * The meta object literal for the '<em><b>Size</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE__SIZE = eINSTANCE.getXmlCache_Size();
-
-		/**
-		 * The meta object literal for the '<em><b>Shared</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE__SHARED = eINSTANCE.getXmlCache_Shared();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE__TYPE = eINSTANCE.getXmlCache_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Always Refresh</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE__ALWAYS_REFRESH = eINSTANCE.getXmlCache_AlwaysRefresh();
-
-		/**
-		 * The meta object literal for the '<em><b>Refresh Only If Newer</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE__REFRESH_ONLY_IF_NEWER = eINSTANCE.getXmlCache_RefreshOnlyIfNewer();
-
-		/**
-		 * The meta object literal for the '<em><b>Disable Hits</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE__DISABLE_HITS = eINSTANCE.getXmlCache_DisableHits();
-
-		/**
-		 * The meta object literal for the '<em><b>Coordination Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE__COORDINATION_TYPE = eINSTANCE.getXmlCache_CoordinationType();
-
-		/**
-		 * The meta object literal for the '<em><b>Expiry Time Of Day</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CACHE__EXPIRY_TIME_OF_DAY = eINSTANCE.getXmlCache_ExpiryTimeOfDay();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder <em>Xml Cache Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder()
-		 * @generated
-		 */
-		public static final EClass XML_CACHE_HOLDER = eINSTANCE.getXmlCacheHolder();
-
-		/**
-		 * The meta object literal for the '<em><b>Cache</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CACHE_HOLDER__CACHE = eINSTANCE.getXmlCacheHolder_Cache();
-
-		/**
-		 * The meta object literal for the '<em><b>Existence Checking</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE_HOLDER__EXISTENCE_CHECKING = eINSTANCE.getXmlCacheHolder_ExistenceChecking();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex <em>Xml Cache Index</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheIndex
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheIndex()
-		 * @generated
-		 */
-		public static final EClass XML_CACHE_INDEX = eINSTANCE.getXmlCacheIndex();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking <em>Xml Change Tracking</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking()
-		 * @generated
-		 */
-		public static final EClass XML_CHANGE_TRACKING = eINSTANCE.getXmlChangeTracking();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CHANGE_TRACKING__TYPE = eINSTANCE.getXmlChangeTracking_Type();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder <em>Xml Change Tracking Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder()
-		 * @generated
-		 */
-		public static final EClass XML_CHANGE_TRACKING_HOLDER = eINSTANCE.getXmlChangeTrackingHolder();
-
-		/**
-		 * The meta object literal for the '<em><b>Change Tracking</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING = eINSTANCE.getXmlChangeTrackingHolder_ChangeTracking();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy <em>Xml Clone Copy Policy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy()
-		 * @generated
-		 */
-		public static final EClass XML_CLONE_COPY_POLICY = eINSTANCE.getXmlCloneCopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Method</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CLONE_COPY_POLICY__METHOD = eINSTANCE.getXmlCloneCopyPolicy_Method();
-
-		/**
-		 * The meta object literal for the '<em><b>Working Copy Method</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD = eINSTANCE.getXmlCloneCopyPolicy_WorkingCopyMethod();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCollectionTable
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionTable()
-		 * @generated
-		 */
-		public static final EClass XML_COLLECTION_TABLE = eINSTANCE.getXmlCollectionTable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
-		 * @generated
-		 */
-		public static final EClass XML_CONVERSION_VALUE = eINSTANCE.getXmlConversionValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Data Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CONVERSION_VALUE__DATA_VALUE = eINSTANCE.getXmlConversionValue_DataValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Object Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CONVERSION_VALUE__OBJECT_VALUE = eINSTANCE.getXmlConversionValue_ObjectValue();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter <em>Xml Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter()
-		 * @generated
-		 */
-		public static final EClass XML_CONVERTER = eINSTANCE.getXmlConverter();
-
-		/**
-		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CONVERTER__CLASS_NAME = eINSTANCE.getXmlConverter_ClassName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder()
-		 * @generated
-		 */
-		public static final EClass XML_CONVERTER_HOLDER = eINSTANCE.getXmlConverterHolder();
-
-		/**
-		 * The meta object literal for the '<em><b>Converter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CONVERTER_HOLDER__CONVERTER = eINSTANCE.getXmlConverterHolder_Converter();
-
-		/**
-		 * The meta object literal for the '<em><b>Type Converter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CONVERTER_HOLDER__TYPE_CONVERTER = eINSTANCE.getXmlConverterHolder_TypeConverter();
-
-		/**
-		 * The meta object literal for the '<em><b>Object Type Converter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER = eINSTANCE.getXmlConverterHolder_ObjectTypeConverter();
-
-		/**
-		 * The meta object literal for the '<em><b>Struct Converter</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CONVERTER_HOLDER__STRUCT_CONVERTER = eINSTANCE.getXmlConverterHolder_StructConverter();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder <em>Xml Converters Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder()
-		 * @generated
-		 */
-		public static final EClass XML_CONVERTERS_HOLDER = eINSTANCE.getXmlConvertersHolder();
-
-		/**
-		 * The meta object literal for the '<em><b>Converters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CONVERTERS_HOLDER__CONVERTERS = eINSTANCE.getXmlConvertersHolder_Converters();
-
-		/**
-		 * The meta object literal for the '<em><b>Type Converters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CONVERTERS_HOLDER__TYPE_CONVERTERS = eINSTANCE.getXmlConvertersHolder_TypeConverters();
-
-		/**
-		 * The meta object literal for the '<em><b>Object Type Converters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS = eINSTANCE.getXmlConvertersHolder_ObjectTypeConverters();
-
-		/**
-		 * The meta object literal for the '<em><b>Struct Converters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS = eINSTANCE.getXmlConvertersHolder_StructConverters();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping <em>Xml Convertible Mapping</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping()
-		 * @generated
-		 */
-		public static final EClass XML_CONVERTIBLE_MAPPING = eINSTANCE.getXmlConvertibleMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Convert</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CONVERTIBLE_MAPPING__CONVERT = eINSTANCE.getXmlConvertibleMapping_Convert();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy <em>Xml Copy Policy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCopyPolicy()
-		 * @generated
-		 */
-		public static final EClass XML_COPY_POLICY = eINSTANCE.getXmlCopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_COPY_POLICY__CLASS = eINSTANCE.getXmlCopyPolicy_Class();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer <em>Xml Customizer</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer()
-		 * @generated
-		 */
-		public static final EClass XML_CUSTOMIZER = eINSTANCE.getXmlCustomizer();
-
-		/**
-		 * The meta object literal for the '<em><b>Customizer Class Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME = eINSTANCE.getXmlCustomizer_CustomizerClassName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder <em>Xml Customizer Holder</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder()
-		 * @generated
-		 */
-		public static final EClass XML_CUSTOMIZER_HOLDER = eINSTANCE.getXmlCustomizerHolder();
-
-		/**
-		 * The meta object literal for the '<em><b>Customizer</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_CUSTOMIZER_HOLDER__CUSTOMIZER = eINSTANCE.getXmlCustomizerHolder_Customizer();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection()
-		 * @generated
-		 */
-		public static final EClass XML_ELEMENT_COLLECTION = eINSTANCE.getXmlElementCollection();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDABLE = eINSTANCE.getXmlEmbeddable();
-
-		/**
-		 * The meta object literal for the '<em><b>Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_EMBEDDABLE__COPY_POLICY = eINSTANCE.getXmlEmbeddable_CopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Instantiation Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY = eINSTANCE.getXmlEmbeddable_InstantiationCopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Clone Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_EMBEDDABLE__CLONE_COPY_POLICY = eINSTANCE.getXmlEmbeddable_CloneCopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Default Mappings</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS = eINSTANCE.getXmlEmbeddable_ExcludeDefaultMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED = eINSTANCE.getXmlEmbedded();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_ID = eINSTANCE.getXmlEmbeddedId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY = eINSTANCE.getXmlEntity();
-
-		/**
-		 * The meta object literal for the '<em><b>Optimistic Locking</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__OPTIMISTIC_LOCKING = eINSTANCE.getXmlEntity_OptimisticLocking();
-
-		/**
-		 * The meta object literal for the '<em><b>Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__COPY_POLICY = eINSTANCE.getXmlEntity_CopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Instantiation Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__INSTANTIATION_COPY_POLICY = eINSTANCE.getXmlEntity_InstantiationCopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Clone Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY__CLONE_COPY_POLICY = eINSTANCE.getXmlEntity_CloneCopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Default Mappings</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS = eINSTANCE.getXmlEntity_ExcludeDefaultMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_MAPPINGS = eINSTANCE.getXmlEntityMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute <em>Xml Fetch Attribute</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute()
-		 * @generated
-		 */
-		public static final EClass XML_FETCH_ATTRIBUTE = eINSTANCE.getXmlFetchAttribute();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup <em>Xml Fetch Group</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup()
-		 * @generated
-		 */
-		public static final EClass XML_FETCH_GROUP = eINSTANCE.getXmlFetchGroup();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId()
-		 * @generated
-		 */
-		public static final EClass XML_ID = eINSTANCE.getXmlId();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex <em>Xml Index</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex()
-		 * @generated
-		 */
-		public static final EClass XML_INDEX = eINSTANCE.getXmlIndex();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlInstantiationCopyPolicy <em>Xml Instantiation Copy Policy</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlInstantiationCopyPolicy
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationCopyPolicy()
-		 * @generated
-		 */
-		public static final EClass XML_INSTANTIATION_COPY_POLICY = eINSTANCE.getXmlInstantiationCopyPolicy();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch <em>Xml Join Fetch</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch()
-		 * @generated
-		 */
-		public static final EClass XML_JOIN_FETCH = eINSTANCE.getXmlJoinFetch();
-
-		/**
-		 * The meta object literal for the '<em><b>Join Fetch</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_JOIN_FETCH__JOIN_FETCH = eINSTANCE.getXmlJoinFetch_JoinFetch();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable <em>Xml Join Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinTable()
-		 * @generated
-		 */
-		public static final EClass XML_JOIN_TABLE = eINSTANCE.getXmlJoinTable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY = eINSTANCE.getXmlManyToMany();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE = eINSTANCE.getXmlManyToOne();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPED_SUPERCLASS = eINSTANCE.getXmlMappedSuperclass();
-
-		/**
-		 * The meta object literal for the '<em><b>Optimistic Locking</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING = eINSTANCE.getXmlMappedSuperclass_OptimisticLocking();
-
-		/**
-		 * The meta object literal for the '<em><b>Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__COPY_POLICY = eINSTANCE.getXmlMappedSuperclass_CopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Instantiation Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY = eINSTANCE.getXmlMappedSuperclass_InstantiationCopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Clone Copy Policy</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY = eINSTANCE.getXmlMappedSuperclass_CloneCopyPolicy();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Default Mappings</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS = eINSTANCE.getXmlMappedSuperclass_ExcludeDefaultMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant <em>Xml Multitenant</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant()
-		 * @generated
-		 */
-		public static final EClass XML_MULTITENANT = eINSTANCE.getXmlMultitenant();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable <em>Xml Mutable</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable()
-		 * @generated
-		 */
-		public static final EClass XML_MUTABLE = eINSTANCE.getXmlMutable();
-
-		/**
-		 * The meta object literal for the '<em><b>Mutable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MUTABLE__MUTABLE = eINSTANCE.getXmlMutable_Mutable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter <em>Xml Named Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_CONVERTER = eINSTANCE.getXmlNamedConverter();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_CONVERTER__NAME = eINSTANCE.getXmlNamedConverter_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery <em>Xml Named Plsql Stored Function Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredFunctionQuery()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_PLSQL_STORED_FUNCTION_QUERY = eINSTANCE.getXmlNamedPlsqlStoredFunctionQuery();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery <em>Xml Named Plsql Stored Procedure Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredProcedureQuery()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY = eINSTANCE.getXmlNamedPlsqlStoredProcedureQuery();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery <em>Xml Named Stored Function Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredFunctionQuery()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_STORED_FUNCTION_QUERY = eINSTANCE.getXmlNamedStoredFunctionQuery();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery <em>Xml Named Stored Procedure Query</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_STORED_PROCEDURE_QUERY = eINSTANCE.getXmlNamedStoredProcedureQuery();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_STORED_PROCEDURE_QUERY__NAME = eINSTANCE.getXmlNamedStoredProcedureQuery_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Result Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS = eINSTANCE.getXmlNamedStoredProcedureQuery_ResultClass();
-
-		/**
-		 * The meta object literal for the '<em><b>Result Set Mapping</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING = eINSTANCE.getXmlNamedStoredProcedureQuery_ResultSetMapping();
-
-		/**
-		 * The meta object literal for the '<em><b>Procedure Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME = eINSTANCE.getXmlNamedStoredProcedureQuery_ProcedureName();
-
-		/**
-		 * The meta object literal for the '<em><b>Returns Result Set</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET = eINSTANCE.getXmlNamedStoredProcedureQuery_ReturnsResultSet();
-
-		/**
-		 * The meta object literal for the '<em><b>Hints</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_NAMED_STORED_PROCEDURE_QUERY__HINTS = eINSTANCE.getXmlNamedStoredProcedureQuery_Hints();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS = eINSTANCE.getXmlNamedStoredProcedureQuery_Parameters();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
-		 * @generated
-		 */
-		public static final EClass XML_OBJECT_TYPE_CONVERTER = eINSTANCE.getXmlObjectTypeConverter();
-
-		/**
-		 * The meta object literal for the '<em><b>Data Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_OBJECT_TYPE_CONVERTER__DATA_TYPE = eINSTANCE.getXmlObjectTypeConverter_DataType();
-
-		/**
-		 * The meta object literal for the '<em><b>Object Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE = eINSTANCE.getXmlObjectTypeConverter_ObjectType();
-
-		/**
-		 * The meta object literal for the '<em><b>Conversion Values</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES = eINSTANCE.getXmlObjectTypeConverter_ConversionValues();
-
-		/**
-		 * The meta object literal for the '<em><b>Default Object Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE = eINSTANCE.getXmlObjectTypeConverter_DefaultObjectValue();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY = eINSTANCE.getXmlOneToMany();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE = eINSTANCE.getXmlOneToOne();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking <em>Xml Optimistic Locking</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking()
-		 * @generated
-		 */
-		public static final EClass XML_OPTIMISTIC_LOCKING = eINSTANCE.getXmlOptimisticLocking();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_OPTIMISTIC_LOCKING__TYPE = eINSTANCE.getXmlOptimisticLocking_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_OPTIMISTIC_LOCKING__CASCADE = eINSTANCE.getXmlOptimisticLocking_Cascade();
-
-		/**
-		 * The meta object literal for the '<em><b>Selected Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS = eINSTANCE.getXmlOptimisticLocking_SelectedColumns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOrderColumn
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOrderColumn()
-		 * @generated
-		 */
-		public static final EClass XML_ORDER_COLUMN = eINSTANCE.getXmlOrderColumn();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults()
-		 * @generated
-		 */
-		public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS = eINSTANCE.getXmlPersistenceUnitDefaults();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata()
-		 * @generated
-		 */
-		public static final EClass XML_PERSISTENCE_UNIT_METADATA = eINSTANCE.getXmlPersistenceUnitMetadata();
-
-		/**
-		 * The meta object literal for the '<em><b>Exclude Default Mappings</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS = eINSTANCE.getXmlPersistenceUnitMetadata_ExcludeDefaultMappings();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey <em>Xml Primary Key</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey()
-		 * @generated
-		 */
-		public static final EClass XML_PRIMARY_KEY = eINSTANCE.getXmlPrimaryKey();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned <em>Xml Private Owned</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned()
-		 * @generated
-		 */
-		public static final EClass XML_PRIVATE_OWNED = eINSTANCE.getXmlPrivateOwned();
-
-		/**
-		 * The meta object literal for the '<em><b>Private Owned</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PRIVATE_OWNED__PRIVATE_OWNED = eINSTANCE.getXmlPrivateOwned_PrivateOwned();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty <em>Xml Property</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty()
-		 * @generated
-		 */
-		public static final EClass XML_PROPERTY = eINSTANCE.getXmlProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PROPERTY__NAME = eINSTANCE.getXmlProperty_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 XML_PROPERTY__VALUE = eINSTANCE.getXmlProperty_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 XML_PROPERTY__VALUE_TYPE = eINSTANCE.getXmlProperty_ValueType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer <em>Xml Property Container</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer()
-		 * @generated
-		 */
-		public static final EClass XML_PROPERTY_CONTAINER = eINSTANCE.getXmlPropertyContainer();
-
-		/**
-		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PROPERTY_CONTAINER__PROPERTIES = eINSTANCE.getXmlPropertyContainer_Properties();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer <em>Xml Query Container</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer()
-		 * @generated
-		 */
-		public static final EClass XML_QUERY_CONTAINER = eINSTANCE.getXmlQueryContainer();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES = eINSTANCE.getXmlQueryContainer_NamedStoredProcedureQueries();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors <em>Xml Query Redirectors</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors()
-		 * @generated
-		 */
-		public static final EClass XML_QUERY_REDIRECTORS = eINSTANCE.getXmlQueryRedirectors();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly <em>Xml Read Only</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly()
-		 * @generated
-		 */
-		public static final EClass XML_READ_ONLY = eINSTANCE.getXmlReadOnly();
-
-		/**
-		 * 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 XML_READ_ONLY__READ_ONLY = eINSTANCE.getXmlReadOnly_ReadOnly();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert <em>Xml Return Insert</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert()
-		 * @generated
-		 */
-		public static final EClass XML_RETURN_INSERT = eINSTANCE.getXmlReturnInsert();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlSecondaryTable <em>Xml Secondary Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlSecondaryTable
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlSecondaryTable()
-		 * @generated
-		 */
-		public static final EClass XML_SECONDARY_TABLE = eINSTANCE.getXmlSecondaryTable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter <em>Xml Stored Procedure Parameter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter()
-		 * @generated
-		 */
-		public static final EClass XML_STORED_PROCEDURE_PARAMETER = eINSTANCE.getXmlStoredProcedureParameter();
-
-		/**
-		 * The meta object literal for the '<em><b>Direction</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER__DIRECTION = eINSTANCE.getXmlStoredProcedureParameter_Direction();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER__NAME = eINSTANCE.getXmlStoredProcedureParameter_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Query Parameter</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER = eINSTANCE.getXmlStoredProcedureParameter_QueryParameter();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER__TYPE = eINSTANCE.getXmlStoredProcedureParameter_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Jdbc Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE = eINSTANCE.getXmlStoredProcedureParameter_JdbcType();
-
-		/**
-		 * The meta object literal for the '<em><b>Jdbc Type Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE_NAME = eINSTANCE.getXmlStoredProcedureParameter_JdbcTypeName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStruct <em>Xml Struct</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStruct
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStruct()
-		 * @generated
-		 */
-		public static final EClass XML_STRUCT = eINSTANCE.getXmlStruct();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter <em>Xml Struct Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
-		 * @generated
-		 */
-		public static final EClass XML_STRUCT_CONVERTER = eINSTANCE.getXmlStructConverter();
-
-		/**
-		 * The meta object literal for the '<em><b>Converter</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_STRUCT_CONVERTER__CONVERTER = eINSTANCE.getXmlStructConverter_Converter();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure <em>Xml Structure</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructure()
-		 * @generated
-		 */
-		public static final EClass XML_STRUCTURE = eINSTANCE.getXmlStructure();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTable <em>Xml Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTable
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTable()
-		 * @generated
-		 */
-		public static final EClass XML_TABLE = eINSTANCE.getXmlTable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTableGenerator()
-		 * @generated
-		 */
-		public static final EClass XML_TABLE_GENERATOR = eINSTANCE.getXmlTableGenerator();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn <em>Xml Tenant Discriminator Column</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn()
-		 * @generated
-		 */
-		public static final EClass XML_TENANT_DISCRIMINATOR_COLUMN = eINSTANCE.getXmlTenantDiscriminatorColumn();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay <em>Xml Time Of Day</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay()
-		 * @generated
-		 */
-		public static final EClass XML_TIME_OF_DAY = eINSTANCE.getXmlTimeOfDay();
-
-		/**
-		 * The meta object literal for the '<em><b>Hour</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TIME_OF_DAY__HOUR = eINSTANCE.getXmlTimeOfDay_Hour();
-
-		/**
-		 * The meta object literal for the '<em><b>Minute</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TIME_OF_DAY__MINUTE = eINSTANCE.getXmlTimeOfDay_Minute();
-
-		/**
-		 * The meta object literal for the '<em><b>Second</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TIME_OF_DAY__SECOND = eINSTANCE.getXmlTimeOfDay_Second();
-
-		/**
-		 * The meta object literal for the '<em><b>Millisecond</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TIME_OF_DAY__MILLISECOND = eINSTANCE.getXmlTimeOfDay_Millisecond();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSFORMATION = eINSTANCE.getXmlTransformation();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransient
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransient()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSIENT = eINSTANCE.getXmlTransient();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
-		 * @generated
-		 */
-		public static final EClass XML_TYPE_CONVERTER = eINSTANCE.getXmlTypeConverter();
-
-		/**
-		 * The meta object literal for the '<em><b>Data Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TYPE_CONVERTER__DATA_TYPE = eINSTANCE.getXmlTypeConverter_DataType();
-
-		/**
-		 * The meta object literal for the '<em><b>Object Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TYPE_CONVERTER__OBJECT_TYPE = eINSTANCE.getXmlTypeConverter_ObjectType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne()
-		 * @generated
-		 */
-		public static final EClass XML_VARIABLE_ONE_TO_ONE = eINSTANCE.getXmlVariableOneToOne();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION = eINSTANCE.getXmlVersion();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning <em>Xml Hash Partitioning</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlHashPartitioning()
-		 * @generated
-		 */
-		public static final EClass XML_HASH_PARTITIONING = eINSTANCE.getXmlHashPartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning <em>Xml Partitioning</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioning()
-		 * @generated
-		 */
-		public static final EClass XML_PARTITIONING = eINSTANCE.getXmlPartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning <em>Xml Pinned Partitioning</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPinnedPartitioning()
-		 * @generated
-		 */
-		public static final EClass XML_PINNED_PARTITIONING = eINSTANCE.getXmlPinnedPartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord <em>Xml Plsql Record</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlRecord()
-		 * @generated
-		 */
-		public static final EClass XML_PLSQL_RECORD = eINSTANCE.getXmlPlsqlRecord();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable <em>Xml Plsql Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlTable()
-		 * @generated
-		 */
-		public static final EClass XML_PLSQL_TABLE = eINSTANCE.getXmlPlsqlTable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning <em>Xml Range Partitioning</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRangePartitioning()
-		 * @generated
-		 */
-		public static final EClass XML_RANGE_PARTITIONING = eINSTANCE.getXmlRangePartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning <em>Xml Replication Partitioning</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReplicationPartitioning()
-		 * @generated
-		 */
-		public static final EClass XML_REPLICATION_PARTITIONING = eINSTANCE.getXmlReplicationPartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning <em>Xml Round Robin Partitioning</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRoundRobinPartitioning()
-		 * @generated
-		 */
-		public static final EClass XML_ROUND_ROBIN_PARTITIONING = eINSTANCE.getXmlRoundRobinPartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning <em>Xml Union Partitioning</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlUnionPartitioning()
-		 * @generated
-		 */
-		public static final EClass XML_UNION_PARTITIONING = eINSTANCE.getXmlUnionPartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning <em>Xml Value Partitioning</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlValuePartitioning()
-		 * @generated
-		 */
-		public static final EClass XML_VALUE_PARTITIONING = eINSTANCE.getXmlValuePartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType <em>Cache Coordination Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheCoordinationType()
-		 * @generated
-		 */
-		public static final EEnum CACHE_COORDINATION_TYPE = eINSTANCE.getCacheCoordinationType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType <em>Cache Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheType()
-		 * @generated
-		 */
-		public static final EEnum CACHE_TYPE = eINSTANCE.getCacheType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType <em>Xml Change Tracking Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingType()
-		 * @generated
-		 */
-		public static final EEnum XML_CHANGE_TRACKING_TYPE = eINSTANCE.getXmlChangeTrackingType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection <em>Xml Direction</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlDirection()
-		 * @generated
-		 */
-		public static final EEnum XML_DIRECTION = eINSTANCE.getXmlDirection();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType <em>Existence Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getExistenceType()
-		 * @generated
-		 */
-		public static final EEnum EXISTENCE_TYPE = eINSTANCE.getExistenceType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType <em>Xml Join Fetch Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetchType()
-		 * @generated
-		 */
-		public static final EEnum XML_JOIN_FETCH_TYPE = eINSTANCE.getXmlJoinFetchType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType <em>Xml Optimistic Locking Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLockingType()
-		 * @generated
-		 */
-		public static final EEnum XML_OPTIMISTIC_LOCKING_TYPE = eINSTANCE.getXmlOptimisticLockingType();
-
-	}
-}
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
deleted file mode 100644
index 57154bbb46..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/EclipseLinkOrmXmlResourceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-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.
- * 
- * @version 2.1
- * @since 2.1
- */
-public class EclipseLinkOrmXmlResourceFactory extends TranslatorResourceFactory
-{
-	public EclipseLinkOrmXmlResourceFactory() {
-		this(RendererFactory.getDefaultRendererFactory());
-	}
-	
-	public EclipseLinkOrmXmlResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-	
-	public EclipseLinkOrmXmlResourceFactory(RendererFactory aRendererFactory, boolean listeningForUpdates) {
-		super(aRendererFactory, listeningForUpdates);
-	}
-	
-	
-	/**
-	 * @see TranslatorResourceFactory#createResource(URI, Renderer)
-	 */
-	@Override
-	protected TranslatorResource createResource(URI uri, Renderer renderer) {
-		return new JpaXmlResource(uri, renderer, JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE, XmlEntityMappings.getRootTranslator());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/ExistenceType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/ExistenceType.java
deleted file mode 100644
index a89707ed20..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/ExistenceType.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-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>Existence Type</b></em>',
- * and utility methods for working with them.
- *  
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getExistenceType()
- * @model
- * @generated
- */
-public enum ExistenceType implements Enumerator
-{
-	/**
-	 * The '<em><b>CHECK CACHE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CHECK_CACHE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CHECK_CACHE(0, "CHECK_CACHE", "CHECK_CACHE"),
-
-	/**
-	 * The '<em><b>CHECK DATABASE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CHECK_DATABASE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CHECK_DATABASE(1, "CHECK_DATABASE", "CHECK_DATABASE"),
-
-	/**
-	 * The '<em><b>ASSUME EXISTENCE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ASSUME_EXISTENCE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ASSUME_EXISTENCE(2, "ASSUME_EXISTENCE", "ASSUME_EXISTENCE"),
-
-	/**
-	 * The '<em><b>ASSUME NON EXISTENCE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ASSUME_NON_EXISTENCE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ASSUME_NON_EXISTENCE(3, "ASSUME_NON_EXISTENCE", "ASSUME_NON_EXISTENCE");
-
-	/**
-	 * The '<em><b>CHECK CACHE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CHECK CACHE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CHECK_CACHE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CHECK_CACHE_VALUE = 0;
-
-	/**
-	 * The '<em><b>CHECK DATABASE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CHECK DATABASE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CHECK_DATABASE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CHECK_DATABASE_VALUE = 1;
-
-	/**
-	 * The '<em><b>ASSUME EXISTENCE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ASSUME EXISTENCE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ASSUME_EXISTENCE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ASSUME_EXISTENCE_VALUE = 2;
-
-	/**
-	 * The '<em><b>ASSUME NON EXISTENCE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ASSUME NON EXISTENCE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ASSUME_NON_EXISTENCE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ASSUME_NON_EXISTENCE_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>Existence Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ExistenceType[] VALUES_ARRAY =
-		new ExistenceType[]
-		{
-			CHECK_CACHE,
-			CHECK_DATABASE,
-			ASSUME_EXISTENCE,
-			ASSUME_NON_EXISTENCE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Existence Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ExistenceType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Existence Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ExistenceType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			ExistenceType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Existence Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ExistenceType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			ExistenceType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Existence Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ExistenceType get(int value)
-	{
-		switch (value)
-		{
-			case CHECK_CACHE_VALUE: return CHECK_CACHE;
-			case CHECK_DATABASE_VALUE: return CHECK_DATABASE;
-			case ASSUME_EXISTENCE_VALUE: return ASSUME_EXISTENCE;
-			case ASSUME_NON_EXISTENCE_VALUE: return ASSUME_NON_EXISTENCE;
-		}
-		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 ExistenceType(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;
-	}
-	
-} //ExistenceType
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
deleted file mode 100644
index afbd13c1f4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethods.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Access Methods</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods#getGetMethod <em>Get Method</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods#getSetMethod <em>Set Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethods()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlAccessMethods extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * 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 XmlAccessMethods()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethods_GetMethod()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getGetMethod()
-	{
-		return getMethod;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods#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, EclipseLinkOrmPackage.XML_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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethods_SetMethod()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getSetMethod()
-	{
-		return setMethod;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethods#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, EclipseLinkOrmPackage.XML_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 EclipseLinkOrmPackage.XML_ACCESS_METHODS__GET_METHOD:
-				return getGetMethod();
-			case EclipseLinkOrmPackage.XML_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 EclipseLinkOrmPackage.XML_ACCESS_METHODS__GET_METHOD:
-				setGetMethod((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_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 EclipseLinkOrmPackage.XML_ACCESS_METHODS__GET_METHOD:
-				setGetMethod(GET_METHOD_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_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 EclipseLinkOrmPackage.XML_ACCESS_METHODS__GET_METHOD:
-				return GET_METHOD_EDEFAULT == null ? getMethod != null : !GET_METHOD_EDEFAULT.equals(getMethod);
-			case EclipseLinkOrmPackage.XML_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();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName,
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethods(),
-			buildTranslatorChildren()
-		);
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildGetMethodTranslator(),
-			buildSetMethodTranslator(),
-		};
-	}
-	
-	protected static Translator buildGetMethodTranslator() {
-		return new Translator(EclipseLink.ACCESS_METHODS__GET_METHOD, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethods_GetMethod(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildSetMethodTranslator() {
-		return new Translator(EclipseLink.ACCESS_METHODS__SET_METHOD, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethods_SetMethod(), Translator.DOM_ATTRIBUTE);
-	}
-	
-} // XmlAccessMethods
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
deleted file mode 100644
index 6e33a0f918..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAccessMethodsHolder.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Access Methods Holder</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder#getAccessMethods <em>Access Methods</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlAccessMethodsHolder extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlAccessMethods getAccessMethods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	void setAccessMethods(XmlAccessMethods value);
-
-} // XmlAccessMethodsHolder
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
deleted file mode 100644
index 15d23edb6f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAdditionalCriteria.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Additional Criteria</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAdditionalCriteria()
- * @model kind="class"
- * @generated
- */
-public class XmlAdditionalCriteria extends AbstractJpaEObject implements XmlAdditionalCriteria_2_2
-{
-	/**
-	 * The default value of the '{@link #getCriteria() <em>Criteria</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCriteria()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CRITERIA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCriteria() <em>Criteria</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCriteria()
-	 * @generated
-	 * @ordered
-	 */
-	protected String criteria = CRITERIA_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlAdditionalCriteria()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ADDITIONAL_CRITERIA;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Criteria</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Criteria</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Criteria</em>' attribute.
-	 * @see #setCriteria(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAdditionalCriteria_2_2_Criteria()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCriteria()
-	{
-		return criteria;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAdditionalCriteria#getCriteria <em>Criteria</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Criteria</em>' attribute.
-	 * @see #getCriteria()
-	 * @generated
-	 */
-	public void setCriteria(String newCriteria)
-	{
-		String oldCriteria = criteria;
-		criteria = newCriteria;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ADDITIONAL_CRITERIA__CRITERIA, oldCriteria, criteria));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ADDITIONAL_CRITERIA__CRITERIA:
-				return getCriteria();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ADDITIONAL_CRITERIA__CRITERIA:
-				setCriteria((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ADDITIONAL_CRITERIA__CRITERIA:
-				setCriteria(CRITERIA_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ADDITIONAL_CRITERIA__CRITERIA:
-				return CRITERIA_EDEFAULT == null ? criteria != null : !CRITERIA_EDEFAULT.equals(criteria);
-		}
-		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(" (criteria: ");
-		result.append(criteria);
-		result.append(')');
-		return result.toString();
-	}
-
-
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlAdditionalCriteria(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildCriteriaTranslator()
-		};
-	}
-	
-	protected static Translator buildCriteriaTranslator() {
-		return new Translator(EclipseLink2_2.CRITERIA, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlAdditionalCriteria_2_2_Criteria());
-	}
-	
-} // XmlAdditionalCriteria
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java
deleted file mode 100644
index 4b80aad25e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlArray.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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;
-import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.EclipseLinkMappingKeys2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Array</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlArray()
- * @model kind="class"
- * @generated
- */
-public class XmlArray extends AbstractXmlAttributeMapping implements XmlAttributeMapping, XmlArray_2_3
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlArray()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ARRAY;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ARRAY__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ARRAY__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ARRAY__PROPERTIES:
-				return getProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ARRAY__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ARRAY__PROPERTIES:
-				getProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ARRAY__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ARRAY__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlArray_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ARRAY__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_ARRAY__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlArray_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys2_3.ARRAY_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlArray(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator()
-		};
-	}
-} // XmlArray
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAttributeMapping.java
deleted file mode 100644
index bf5a017b56..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlAttributeMapping.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Attribute Mapping</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAttributeMapping()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlAttributeMapping 
-	extends org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping, 
-			XmlAccessMethodsHolder, XmlPropertyContainer
-{
-} // XmlAttributeMapping
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java
deleted file mode 100644
index 2ed293aa9b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasic.java
+++ /dev/null
@@ -1,1693 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator;
-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.XmlBasic_1_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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1;
-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.XmlBasic_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2;
-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.XmlBasic_2_4;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Basic</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic()
- * @model kind="class"
- * @generated
- */
-public class XmlBasic extends org.eclipse.jpt.jpa.core.resource.orm.XmlBasic implements XmlBasic_1_1, XmlBasic_2_1, XmlBasic_2_2, XmlBasic_2_4, XmlAttributeMapping, XmlMutable, XmlConvertibleMapping
-{
-	/**
-	 * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSequenceGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlSequenceGenerator sequenceGenerator;
-	/**
-	 * The cached value of the '{@link #getTableGenerator() <em>Table Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTableGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTableGenerator tableGenerator;
-	/**
-	 * The cached value of the '{@link #getGeneratedValue() <em>Generated Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGeneratedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlGeneratedValue generatedValue;
-
-	/**
-	 * The cached value of the '{@link #getReturnInsert() <em>Return Insert</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnInsert()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReturnInsert returnInsert;
-	/**
-	 * The default value of the '{@link #getReturnUpdate() <em>Return Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean RETURN_UPDATE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getReturnUpdate() <em>Return Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean returnUpdate = RETURN_UPDATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getIndex() <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlIndex_2_2 index;
-	/**
-	 * The cached value of the '{@link #getCacheIndex() <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCacheIndex_2_4 cacheIndex;
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-	/**
-	 * The default value of the '{@link #getMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMutable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean MUTABLE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMutable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean mutable = MUTABLE_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlConverter converter;
-	/**
-	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTypeConverter typeConverter;
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlObjectTypeConverter objectTypeConverter;
-	/**
-	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlStructConverter structConverter;
-	/**
-	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONVERT_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String convert = CONVERT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlBasic()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_BASIC;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mutable</em>' attribute.
-	 * @see #setMutable(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable_Mutable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getMutable()
-	{
-		return mutable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getMutable <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mutable</em>' attribute.
-	 * @see #getMutable()
-	 * @generated
-	 */
-	public void setMutable(Boolean newMutable)
-	{
-		Boolean oldMutable = mutable;
-		mutable = newMutable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__MUTABLE, oldMutable, mutable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Convert</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>Convert</em>' attribute.
-	 * @see #setConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getConvert()
-	{
-		return convert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getConvert <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Convert</em>' attribute.
-	 * @see #getConvert()
-	 * @generated
-	 */
-	public void setConvert(String newConvert)
-	{
-		String oldConvert = convert;
-		convert = newConvert;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__CONVERT, oldConvert, convert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sequence Generator</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sequence Generator</em>' containment reference.
-	 * @see #setSequenceGenerator(XmlSequenceGenerator)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer_SequenceGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlSequenceGenerator getSequenceGenerator()
-	{
-		return sequenceGenerator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSequenceGenerator(XmlSequenceGenerator newSequenceGenerator, NotificationChain msgs)
-	{
-		XmlSequenceGenerator oldSequenceGenerator = sequenceGenerator;
-		sequenceGenerator = newSequenceGenerator;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR, oldSequenceGenerator, newSequenceGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getSequenceGenerator <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sequence Generator</em>' containment reference.
-	 * @see #getSequenceGenerator()
-	 * @generated
-	 */
-	public void setSequenceGenerator(XmlSequenceGenerator newSequenceGenerator)
-	{
-		if (newSequenceGenerator != sequenceGenerator)
-		{
-			NotificationChain msgs = null;
-			if (sequenceGenerator != null)
-				msgs = ((InternalEObject)sequenceGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR, null, msgs);
-			if (newSequenceGenerator != null)
-				msgs = ((InternalEObject)newSequenceGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR, null, msgs);
-			msgs = basicSetSequenceGenerator(newSequenceGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR, newSequenceGenerator, newSequenceGenerator));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table Generator</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table Generator</em>' containment reference.
-	 * @see #setTableGenerator(XmlTableGenerator)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer_TableGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTableGenerator getTableGenerator()
-	{
-		return tableGenerator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTableGenerator(XmlTableGenerator newTableGenerator, NotificationChain msgs)
-	{
-		XmlTableGenerator oldTableGenerator = tableGenerator;
-		tableGenerator = newTableGenerator;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR, oldTableGenerator, newTableGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getTableGenerator <em>Table Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table Generator</em>' containment reference.
-	 * @see #getTableGenerator()
-	 * @generated
-	 */
-	public void setTableGenerator(XmlTableGenerator newTableGenerator)
-	{
-		if (newTableGenerator != tableGenerator)
-		{
-			NotificationChain msgs = null;
-			if (tableGenerator != null)
-				msgs = ((InternalEObject)tableGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR, null, msgs);
-			if (newTableGenerator != null)
-				msgs = ((InternalEObject)newTableGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR, null, msgs);
-			msgs = basicSetTableGenerator(newTableGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR, newTableGenerator, newTableGenerator));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Generated Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Generated Value</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>Generated Value</em>' containment reference.
-	 * @see #setGeneratedValue(XmlGeneratedValue)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_1_1_GeneratedValue()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlGeneratedValue getGeneratedValue()
-	{
-		return generatedValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetGeneratedValue(XmlGeneratedValue newGeneratedValue, NotificationChain msgs)
-	{
-		XmlGeneratedValue oldGeneratedValue = generatedValue;
-		generatedValue = newGeneratedValue;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE, oldGeneratedValue, newGeneratedValue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getGeneratedValue <em>Generated Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generated Value</em>' containment reference.
-	 * @see #getGeneratedValue()
-	 * @generated
-	 */
-	public void setGeneratedValue(XmlGeneratedValue newGeneratedValue)
-	{
-		if (newGeneratedValue != generatedValue)
-		{
-			NotificationChain msgs = null;
-			if (generatedValue != null)
-				msgs = ((InternalEObject)generatedValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE, null, msgs);
-			if (newGeneratedValue != null)
-				msgs = ((InternalEObject)newGeneratedValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE, null, msgs);
-			msgs = basicSetGeneratedValue(newGeneratedValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE, newGeneratedValue, newGeneratedValue));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Return Insert</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Insert</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Insert</em>' containment reference.
-	 * @see #setReturnInsert(XmlReturnInsert)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_1_ReturnInsert()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReturnInsert getReturnInsert()
-	{
-		return returnInsert;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReturnInsert(XmlReturnInsert newReturnInsert, NotificationChain msgs)
-	{
-		XmlReturnInsert oldReturnInsert = returnInsert;
-		returnInsert = newReturnInsert;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT, oldReturnInsert, newReturnInsert);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getReturnInsert <em>Return Insert</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Insert</em>' containment reference.
-	 * @see #getReturnInsert()
-	 * @generated
-	 */
-	public void setReturnInsert(XmlReturnInsert newReturnInsert)
-	{
-		if (newReturnInsert != returnInsert)
-		{
-			NotificationChain msgs = null;
-			if (returnInsert != null)
-				msgs = ((InternalEObject)returnInsert).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT, null, msgs);
-			if (newReturnInsert != null)
-				msgs = ((InternalEObject)newReturnInsert).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT, null, msgs);
-			msgs = basicSetReturnInsert(newReturnInsert, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT, newReturnInsert, newReturnInsert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Return Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Update</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Update</em>' attribute.
-	 * @see #setReturnUpdate(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_1_ReturnUpdate()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getReturnUpdate()
-	{
-		return returnUpdate;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getReturnUpdate <em>Return Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Update</em>' attribute.
-	 * @see #getReturnUpdate()
-	 * @generated
-	 */
-	public void setReturnUpdate(Boolean newReturnUpdate)
-	{
-		Boolean oldReturnUpdate = returnUpdate;
-		returnUpdate = newReturnUpdate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE, oldReturnUpdate, returnUpdate));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(XmlIndex_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_2_Index()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlIndex_2_2 getIndex()
-	{
-		return index;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIndex(XmlIndex_2_2 newIndex, NotificationChain msgs)
-	{
-		XmlIndex_2_2 oldIndex = index;
-		index = newIndex;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__INDEX, oldIndex, newIndex);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	public void setIndex(XmlIndex_2_2 newIndex)
-	{
-		if (newIndex != index)
-		{
-			NotificationChain msgs = null;
-			if (index != null)
-				msgs = ((InternalEObject)index).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__INDEX, null, msgs);
-			if (newIndex != null)
-				msgs = ((InternalEObject)newIndex).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__INDEX, null, msgs);
-			msgs = basicSetIndex(newIndex, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__INDEX, newIndex, newIndex));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Index</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>Cache Index</em>' containment reference.
-	 * @see #setCacheIndex(XmlCacheIndex_2_4)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic_2_4_CacheIndex()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCacheIndex_2_4 getCacheIndex()
-	{
-		return cacheIndex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCacheIndex(XmlCacheIndex_2_4 newCacheIndex, NotificationChain msgs)
-	{
-		XmlCacheIndex_2_4 oldCacheIndex = cacheIndex;
-		cacheIndex = newCacheIndex;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX, oldCacheIndex, newCacheIndex);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getCacheIndex <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Index</em>' containment reference.
-	 * @see #getCacheIndex()
-	 * @generated
-	 */
-	public void setCacheIndex(XmlCacheIndex_2_4 newCacheIndex)
-	{
-		if (newCacheIndex != cacheIndex)
-		{
-			NotificationChain msgs = null;
-			if (cacheIndex != null)
-				msgs = ((InternalEObject)cacheIndex).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX, null, msgs);
-			if (newCacheIndex != null)
-				msgs = ((InternalEObject)newCacheIndex).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX, null, msgs);
-			msgs = basicSetCacheIndex(newCacheIndex, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX, newCacheIndex, newCacheIndex));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_BASIC__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>CustomConverter</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>Converter</em>' containment reference.
-	 * @see #setConverter(XmlConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlConverter getConverter()
-	{
-		return converter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetConverter(XmlConverter newConverter, NotificationChain msgs)
-	{
-		XmlConverter oldConverter = converter;
-		converter = newConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getConverter <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter</em>' containment reference.
-	 * @see #getConverter()
-	 * @generated
-	 */
-	public void setConverter(XmlConverter newConverter)
-	{
-		if (newConverter != converter)
-		{
-			NotificationChain msgs = null;
-			if (converter != null)
-				msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__CONVERTER, newConverter, newConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type CustomConverter</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>Type Converter</em>' containment reference.
-	 * @see #setTypeConverter(XmlTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTypeConverter getTypeConverter()
-	{
-		return typeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTypeConverter(XmlTypeConverter newTypeConverter, NotificationChain msgs)
-	{
-		XmlTypeConverter oldTypeConverter = typeConverter;
-		typeConverter = newTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getTypeConverter <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Converter</em>' containment reference.
-	 * @see #getTypeConverter()
-	 * @generated
-	 */
-	public void setTypeConverter(XmlTypeConverter newTypeConverter)
-	{
-		if (newTypeConverter != typeConverter)
-		{
-			NotificationChain msgs = null;
-			if (typeConverter != null)
-				msgs = ((InternalEObject)typeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER, null, msgs);
-			msgs = basicSetTypeConverter(newTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER, newTypeConverter, newTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type CustomConverter</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>Object Type Converter</em>' containment reference.
-	 * @see #setObjectTypeConverter(XmlObjectTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlObjectTypeConverter getObjectTypeConverter()
-	{
-		return objectTypeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter, NotificationChain msgs)
-	{
-		XmlObjectTypeConverter oldObjectTypeConverter = objectTypeConverter;
-		objectTypeConverter = newObjectTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER, oldObjectTypeConverter, newObjectTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type Converter</em>' containment reference.
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 */
-	public void setObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter)
-	{
-		if (newObjectTypeConverter != objectTypeConverter)
-		{
-			NotificationChain msgs = null;
-			if (objectTypeConverter != null)
-				msgs = ((InternalEObject)objectTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER, null, msgs);
-			msgs = basicSetObjectTypeConverter(newObjectTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER, newObjectTypeConverter, newObjectTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct CustomConverter</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>Struct Converter</em>' containment reference.
-	 * @see #setStructConverter(XmlStructConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlStructConverter getStructConverter()
-	{
-		return structConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStructConverter(XmlStructConverter newStructConverter, NotificationChain msgs)
-	{
-		XmlStructConverter oldStructConverter = structConverter;
-		structConverter = newStructConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic#getStructConverter <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct Converter</em>' containment reference.
-	 * @see #getStructConverter()
-	 * @generated
-	 */
-	public void setStructConverter(XmlStructConverter newStructConverter)
-	{
-		if (newStructConverter != structConverter)
-		{
-			NotificationChain msgs = null;
-			if (structConverter != null)
-				msgs = ((InternalEObject)structConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER, null, msgs);
-			msgs = basicSetStructConverter(newStructConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER, newStructConverter, newStructConverter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR:
-				return basicSetSequenceGenerator(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR:
-				return basicSetTableGenerator(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
-				return basicSetGeneratedValue(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
-				return basicSetReturnInsert(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__INDEX:
-				return basicSetIndex(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX:
-				return basicSetCacheIndex(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER:
-				return basicSetStructConverter(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 EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR:
-				return getSequenceGenerator();
-			case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR:
-				return getTableGenerator();
-			case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
-				return getGeneratedValue();
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
-				return getReturnInsert();
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE:
-				return getReturnUpdate();
-			case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_BASIC__INDEX:
-				return getIndex();
-			case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX:
-				return getCacheIndex();
-			case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_BASIC__MUTABLE:
-				return getMutable();
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERT:
-				return getConvert();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR:
-				setSequenceGenerator((XmlSequenceGenerator)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
-				setGeneratedValue((XmlGeneratedValue)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
-				setReturnInsert((XmlReturnInsert)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE:
-				setReturnUpdate((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__INDEX:
-				setIndex((XmlIndex_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX:
-				setCacheIndex((XmlCacheIndex_2_4)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__MUTABLE:
-				setMutable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERT:
-				setConvert((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR:
-				setSequenceGenerator((XmlSequenceGenerator)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
-				setGeneratedValue((XmlGeneratedValue)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
-				setReturnInsert((XmlReturnInsert)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE:
-				setReturnUpdate(RETURN_UPDATE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__INDEX:
-				setIndex((XmlIndex_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX:
-				setCacheIndex((XmlCacheIndex_2_4)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR:
-				return sequenceGenerator != null;
-			case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR:
-				return tableGenerator != null;
-			case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE:
-				return generatedValue != null;
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT:
-				return returnInsert != null;
-			case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE:
-				return RETURN_UPDATE_EDEFAULT == null ? returnUpdate != null : !RETURN_UPDATE_EDEFAULT.equals(returnUpdate);
-			case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_BASIC__INDEX:
-				return index != null;
-			case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX:
-				return cacheIndex != null;
-			case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_BASIC__MUTABLE:
-				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_BASIC__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlGeneratorContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR;
-				case EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic_1_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE: return EclipseLinkOrmV1_1Package.XML_BASIC_11__GENERATED_VALUE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT: return EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_INSERT;
-				case EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE: return EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_UPDATE;
-				case EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_BASIC_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__INDEX: return EclipseLinkOrmV2_2Package.XML_BASIC_22__INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic_2_4.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX: return EclipseLinkOrmV2_4Package.XML_BASIC_24__CACHE_INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMutable.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__MUTABLE: return EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
-				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 == XmlGeneratorContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR: return EclipseLinkOrmPackage.XML_BASIC__SEQUENCE_GENERATOR;
-				case OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR: return EclipseLinkOrmPackage.XML_BASIC__TABLE_GENERATOR;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic_1_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV1_1Package.XML_BASIC_11__GENERATED_VALUE: return EclipseLinkOrmPackage.XML_BASIC__GENERATED_VALUE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_INSERT: return EclipseLinkOrmPackage.XML_BASIC__RETURN_INSERT;
-				case EclipseLinkOrmV2_1Package.XML_BASIC_21__RETURN_UPDATE: return EclipseLinkOrmPackage.XML_BASIC__RETURN_UPDATE;
-				case EclipseLinkOrmV2_1Package.XML_BASIC_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_BASIC__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_BASIC_22__INDEX: return EclipseLinkOrmPackage.XML_BASIC__INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasic_2_4.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_4Package.XML_BASIC_24__CACHE_INDEX: return EclipseLinkOrmPackage.XML_BASIC__CACHE_INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_BASIC__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMutable.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE: return EclipseLinkOrmPackage.XML_BASIC__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_BASIC__CONVERT;
-				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(" (returnUpdate: ");
-		result.append(returnUpdate);
-		result.append(", attributeType: ");
-		result.append(attributeType);
-		result.append(", mutable: ");
-		result.append(mutable);
-		result.append(", convert: ");
-		result.append(convert);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getMutableTextRange() {
-		return getAttributeTextRange(EclipseLink.MUTABLE);
-	}
-	
-	public TextRange getConvertTextRange() {
-		return getElementTextRange(EclipseLink.CONVERT);
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlBasic(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildFetchTranslator(),
-			buildOptionalTranslator(),
-			buildAccessTranslator(),
-			buildMutableTranslator(),
-			buildAttributeTypeTranslator(),
-			buildColumnTranslator(), 
-			buildIndexTranslator(), 
-			buildCacheIndexTranslator(), 
-			buildGeneratedValueTranslator(), 
-			buildLobTranslator(),
-			buildTemporalTranslator(),
-			buildEnumeratedTranslator(),
-			buildConvertTranslator(),
-			buildConverterTranslator(),
-			buildTypeConverterTranslator(),
-			buildObjectTypeConverterTranslator(),
-			buildStructConverterTranslator(),
-			buildTableGeneratorTranslator(),
-			buildSequenceGeneratorTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator(),
-			buildReturnInsertTranslator(),
-			buildReturnUpdateTranslator()};
-	}
-	
-	protected static Translator buildMutableTranslator() {
-		return new Translator(EclipseLink.MUTABLE, EclipseLinkOrmPackage.eINSTANCE.getXmlMutable_Mutable(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildIndexTranslator() {
-		return XmlIndex.buildTranslator(EclipseLink2_2.INDEX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlBasic_2_2_Index());
-	}
-
-	protected static Translator buildCacheIndexTranslator() {
-		return XmlCacheIndex.buildTranslator(EclipseLink2_4.CACHE_INDEX, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlBasic_2_4_CacheIndex());
-	}
-	
-	protected static Translator buildGeneratedValueTranslator() {
-		return XmlGeneratedValue.buildTranslator(EclipseLink1_1.GENERATED_VALUE, EclipseLinkOrmV1_1Package.eINSTANCE.getXmlBasic_1_1_GeneratedValue());
-	}
-	
-	protected static Translator buildConvertTranslator() {
-		return new Translator(EclipseLink.CONVERT, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertibleMapping_Convert());
-	}
-	
-	protected static Translator buildConverterTranslator() {
-		return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_Converter());
-	}
-	
-	protected static Translator buildTypeConverterTranslator() {
-		return XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_TypeConverter());
-	}
-	
-	protected static Translator buildObjectTypeConverterTranslator() {
-		return XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_ObjectTypeConverter());
-	}
-	
-	protected static Translator buildStructConverterTranslator() {
-		return XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_StructConverter());
-	}
-		
-	protected static Translator buildTableGeneratorTranslator() {
-		return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator.buildTranslator(EclipseLink1_1.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_TableGenerator());
-	}
-	
-	protected static Translator buildSequenceGeneratorTranslator() {
-		return XmlSequenceGenerator.buildTranslator(EclipseLink1_1.SEQUENCE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_SequenceGenerator());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-	
-	protected static Translator buildReturnInsertTranslator() {
-		return XmlReturnInsert.buildTranslator(EclipseLink2_1.RETURN_INSERT, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBasic_2_1_ReturnInsert());
-	}
-	
-	protected static Translator buildReturnUpdateTranslator() {
-		return new Translator(EclipseLink2_1.RETURN_UPDATE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBasic_2_1_ReturnUpdate());	
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBasic_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasicCollection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasicCollection.java
deleted file mode 100644
index 66459fddc9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasicCollection.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Collection Impl</b></em>'.
- *
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves. *
- *
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicCollection extends AbstractXmlAttributeMapping implements XmlAttributeMapping, XmlBasicCollection_2_2
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The default value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CASCADE_ON_DELETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cascadeOnDelete = CASCADE_ON_DELETE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlBasicCollection()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_BASIC_COLLECTION;
-	}
-	
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicCollection_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCascadeOnDelete()
-	{
-		return cascadeOnDelete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	public void setCascadeOnDelete(Boolean newCascadeOnDelete)
-	{
-		Boolean oldCascadeOnDelete = cascadeOnDelete;
-		cascadeOnDelete = newCascadeOnDelete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC_COLLECTION__CASCADE_ON_DELETE, oldCascadeOnDelete, cascadeOnDelete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__CASCADE_ON_DELETE:
-				return getCascadeOnDelete();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__CASCADE_ON_DELETE:
-				setCascadeOnDelete((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__CASCADE_ON_DELETE:
-				setCascadeOnDelete(CASCADE_ON_DELETE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__CASCADE_ON_DELETE:
-				return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicCollection_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_COLLECTION__CASCADE_ON_DELETE: return EclipseLinkOrmV2_2Package.XML_BASIC_COLLECTION_22__CASCADE_ON_DELETE;
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_BASIC_COLLECTION__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC_COLLECTION__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicCollection_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_BASIC_COLLECTION_22__CASCADE_ON_DELETE: return EclipseLinkOrmPackage.XML_BASIC_COLLECTION__CASCADE_ON_DELETE;
-				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(" (cascadeOnDelete: ");
-		result.append(cascadeOnDelete);
-		result.append(')');
-		return result.toString();
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator()
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasicMap.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasicMap.java
deleted file mode 100644
index 224d0cfd39..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBasicMap.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Map Impl</b></em>'.
- *
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves. *
- *
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap()
- * @model kind="class"
- * @generated
- */
-public class XmlBasicMap extends AbstractXmlAttributeMapping implements XmlAttributeMapping, XmlBasicMap_2_2
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The default value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CASCADE_ON_DELETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cascadeOnDelete = CASCADE_ON_DELETE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlBasicMap()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_BASIC_MAP;
-	}
-	
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicMap_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCascadeOnDelete()
-	{
-		return cascadeOnDelete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	public void setCascadeOnDelete(Boolean newCascadeOnDelete)
-	{
-		Boolean oldCascadeOnDelete = cascadeOnDelete;
-		cascadeOnDelete = newCascadeOnDelete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BASIC_MAP__CASCADE_ON_DELETE, oldCascadeOnDelete, cascadeOnDelete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__CASCADE_ON_DELETE:
-				return getCascadeOnDelete();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__CASCADE_ON_DELETE:
-				setCascadeOnDelete((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__CASCADE_ON_DELETE:
-				setCascadeOnDelete(CASCADE_ON_DELETE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_BASIC_MAP__CASCADE_ON_DELETE:
-				return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicMap_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BASIC_MAP__CASCADE_ON_DELETE: return EclipseLinkOrmV2_2Package.XML_BASIC_MAP_22__CASCADE_ON_DELETE;
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_BASIC_MAP__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_BASIC_MAP__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBasicMap_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_BASIC_MAP_22__CASCADE_ON_DELETE: return EclipseLinkOrmPackage.XML_BASIC_MAP__CASCADE_ON_DELETE;
-				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(" (cascadeOnDelete: ");
-		result.append(cascadeOnDelete);
-		result.append(')');
-		return result.toString();
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator()
-		};
-	}
-}
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
deleted file mode 100644
index a7301e857d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetch.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xm Batch Fetch</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch()
- * @model kind="class"
- * @generated
- */
-public class XmlBatchFetch extends AbstractJpaEObject implements XmlBatchFetch_2_1
-{
-	/**
-	 * The default value of the '{@link #getSize() <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer SIZE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSize() <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer size = SIZE_EDEFAULT;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final BatchFetchType_2_1 BATCH_FETCH_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBatchFetchType() <em>Batch Fetch Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBatchFetchType()
-	 * @generated
-	 * @ordered
-	 */
-	protected BatchFetchType_2_1 batchFetchType = BATCH_FETCH_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlBatchFetch()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_BATCH_FETCH;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Size</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Size</em>' attribute.
-	 * @see #setSize(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch_2_1_Size()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getSize()
-	{
-		return size;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetch#getSize <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Size</em>' attribute.
-	 * @see #getSize()
-	 * @generated
-	 */
-	public void setSize(Integer newSize)
-	{
-		Integer oldSize = size;
-		size = newSize;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE, oldSize, size));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Batch Fetch Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Batch Fetch 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>Batch Fetch Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1
-	 * @see #setBatchFetchType(BatchFetchType_2_1)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetch_2_1_BatchFetchType()
-	 * @model
-	 * @generated
-	 */
-	public BatchFetchType_2_1 getBatchFetchType()
-	{
-		return batchFetchType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetch#getBatchFetchType <em>Batch Fetch Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Fetch Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1
-	 * @see #getBatchFetchType()
-	 * @generated
-	 */
-	public void setBatchFetchType(BatchFetchType_2_1 newBatchFetchType)
-	{
-		BatchFetchType_2_1 oldBatchFetchType = batchFetchType;
-		batchFetchType = newBatchFetchType == null ? BATCH_FETCH_TYPE_EDEFAULT : newBatchFetchType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE, oldBatchFetchType, batchFetchType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE:
-				return getSize();
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE:
-				return getBatchFetchType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE:
-				setSize((Integer)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE:
-				setBatchFetchType((BatchFetchType_2_1)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE:
-				setSize(SIZE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE:
-				setBatchFetchType(BATCH_FETCH_TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH__SIZE:
-				return SIZE_EDEFAULT == null ? size != null : !SIZE_EDEFAULT.equals(size);
-			case EclipseLinkOrmPackage.XML_BATCH_FETCH__BATCH_FETCH_TYPE:
-				return batchFetchType != BATCH_FETCH_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(" (size: ");
-		result.append(size);
-		result.append(", batchFetchType: ");
-		result.append(batchFetchType);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName,
-			structuralFeature,
-			Translator.END_TAG_NO_INDENT,
-			buildTranslatorChildren()
-		);
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildSizeTranslator(),
-			buildBatchFetchTypeTranslator(),
-		};
-	}
-	
-	protected static Translator buildSizeTranslator() {
-		return new Translator(EclipseLink2_1.BATCH_FETCH__SIZE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBatchFetch_2_1_Size(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildBatchFetchTypeTranslator() {
-		return new Translator(EclipseLink2_1.BATCH_FETCH__TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlBatchFetch_2_1_BatchFetchType(), Translator.DOM_ATTRIBUTE);
-	}
-
-} // XmBatchFetch
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
deleted file mode 100644
index a1b6747965..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlBatchFetchHolder.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Batch Fetch Holder</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder#getBatchFetch <em>Batch Fetch</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlBatchFetchHolder extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference.
-	 * @see #setBatchFetch(XmlBatchFetch)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlBatchFetch getBatchFetch();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder#getBatchFetch <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Fetch</em>' containment reference.
-	 * @see #getBatchFetch()
-	 * @generated
-	 */
-	void setBatchFetch(XmlBatchFetch value);
-
-} // XmlBatchFetchHolder
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
deleted file mode 100644
index 41f96f90c8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCache.java
+++ /dev/null
@@ -1,841 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-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.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.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Cache</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getExpiry <em>Expiry</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getSize <em>Size</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getShared <em>Shared</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getAlwaysRefresh <em>Always Refresh</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getRefreshOnlyIfNewer <em>Refresh Only If Newer</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getDisableHits <em>Disable Hits</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getCoordinationType <em>Coordination Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getExpiryTimeOfDay <em>Expiry Time Of Day</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlCache extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getExpiry() <em>Expiry</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpiry()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer EXPIRY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExpiry() <em>Expiry</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpiry()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer expiry = EXPIRY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSize() <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer SIZE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSize() <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer size = SIZE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getShared() <em>Shared</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShared()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean SHARED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getShared() <em>Shared</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShared()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean shared = SHARED_EDEFAULT;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final CacheType 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 CacheType type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAlwaysRefresh() <em>Always Refresh</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlwaysRefresh()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean ALWAYS_REFRESH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAlwaysRefresh() <em>Always Refresh</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlwaysRefresh()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean alwaysRefresh = ALWAYS_REFRESH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRefreshOnlyIfNewer() <em>Refresh Only If Newer</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRefreshOnlyIfNewer()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean REFRESH_ONLY_IF_NEWER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRefreshOnlyIfNewer() <em>Refresh Only If Newer</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRefreshOnlyIfNewer()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean refreshOnlyIfNewer = REFRESH_ONLY_IF_NEWER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisableHits() <em>Disable Hits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisableHits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean DISABLE_HITS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisableHits() <em>Disable Hits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisableHits()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean disableHits = DISABLE_HITS_EDEFAULT;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final CacheCoordinationType COORDINATION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCoordinationType() <em>Coordination Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCoordinationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected CacheCoordinationType coordinationType = COORDINATION_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExpiryTimeOfDay() <em>Expiry Time Of Day</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExpiryTimeOfDay()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTimeOfDay expiryTimeOfDay;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlCache()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CACHE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Expiry</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Expiry</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Expiry</em>' attribute.
-	 * @see #setExpiry(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_Expiry()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getExpiry()
-	{
-		return expiry;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getExpiry <em>Expiry</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expiry</em>' attribute.
-	 * @see #getExpiry()
-	 * @generated
-	 */
-	public void setExpiry(Integer newExpiry)
-	{
-		Integer oldExpiry = expiry;
-		expiry = newExpiry;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__EXPIRY, oldExpiry, expiry));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Size</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Size</em>' attribute.
-	 * @see #setSize(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_Size()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getSize()
-	{
-		return size;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getSize <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Size</em>' attribute.
-	 * @see #getSize()
-	 * @generated
-	 */
-	public void setSize(Integer newSize)
-	{
-		Integer oldSize = size;
-		size = newSize;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__SIZE, oldSize, size));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Shared</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Shared</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Shared</em>' attribute.
-	 * @see #setShared(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_Shared()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getShared()
-	{
-		return shared;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getShared <em>Shared</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Shared</em>' attribute.
-	 * @see #getShared()
-	 * @generated
-	 */
-	public void setShared(Boolean newShared)
-	{
-		Boolean oldShared = shared;
-		shared = newShared;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__SHARED, oldShared, shared));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType}.
-	 * <!-- 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 org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType
-	 * @see #setType(CacheType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_Type()
-	 * @model
-	 * @generated
-	 */
-	public CacheType getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheType
-	 * @see #getType()
-	 * @generated
-	 */
-	public void setType(CacheType newType)
-	{
-		CacheType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__TYPE, oldType, type));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Always Refresh</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Always Refresh</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Always Refresh</em>' attribute.
-	 * @see #setAlwaysRefresh(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_AlwaysRefresh()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getAlwaysRefresh()
-	{
-		return alwaysRefresh;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getAlwaysRefresh <em>Always Refresh</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Always Refresh</em>' attribute.
-	 * @see #getAlwaysRefresh()
-	 * @generated
-	 */
-	public void setAlwaysRefresh(Boolean newAlwaysRefresh)
-	{
-		Boolean oldAlwaysRefresh = alwaysRefresh;
-		alwaysRefresh = newAlwaysRefresh;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__ALWAYS_REFRESH, oldAlwaysRefresh, alwaysRefresh));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Refresh Only If Newer</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Refresh Only If Newer</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Refresh Only If Newer</em>' attribute.
-	 * @see #setRefreshOnlyIfNewer(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_RefreshOnlyIfNewer()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getRefreshOnlyIfNewer()
-	{
-		return refreshOnlyIfNewer;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getRefreshOnlyIfNewer <em>Refresh Only If Newer</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Refresh Only If Newer</em>' attribute.
-	 * @see #getRefreshOnlyIfNewer()
-	 * @generated
-	 */
-	public void setRefreshOnlyIfNewer(Boolean newRefreshOnlyIfNewer)
-	{
-		Boolean oldRefreshOnlyIfNewer = refreshOnlyIfNewer;
-		refreshOnlyIfNewer = newRefreshOnlyIfNewer;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__REFRESH_ONLY_IF_NEWER, oldRefreshOnlyIfNewer, refreshOnlyIfNewer));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Disable Hits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Disable Hits</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Disable Hits</em>' attribute.
-	 * @see #setDisableHits(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_DisableHits()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getDisableHits()
-	{
-		return disableHits;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getDisableHits <em>Disable Hits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Disable Hits</em>' attribute.
-	 * @see #getDisableHits()
-	 * @generated
-	 */
-	public void setDisableHits(Boolean newDisableHits)
-	{
-		Boolean oldDisableHits = disableHits;
-		disableHits = newDisableHits;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__DISABLE_HITS, oldDisableHits, disableHits));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Coordination Type</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Coordination 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>Coordination Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType
-	 * @see #setCoordinationType(CacheCoordinationType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_CoordinationType()
-	 * @model default=""
-	 * @generated
-	 */
-	public CacheCoordinationType getCoordinationType()
-	{
-		return coordinationType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getCoordinationType <em>Coordination Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Coordination Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.CacheCoordinationType
-	 * @see #getCoordinationType()
-	 * @generated
-	 */
-	public void setCoordinationType(CacheCoordinationType newCoordinationType)
-	{
-		CacheCoordinationType oldCoordinationType = coordinationType;
-		coordinationType = newCoordinationType == null ? COORDINATION_TYPE_EDEFAULT : newCoordinationType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__COORDINATION_TYPE, oldCoordinationType, coordinationType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Expiry Time Of Day</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Expiry Time Of Day</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Expiry Time Of Day</em>' containment reference.
-	 * @see #setExpiryTimeOfDay(XmlTimeOfDay)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCache_ExpiryTimeOfDay()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTimeOfDay getExpiryTimeOfDay()
-	{
-		return expiryTimeOfDay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExpiryTimeOfDay(XmlTimeOfDay newExpiryTimeOfDay, NotificationChain msgs)
-	{
-		XmlTimeOfDay oldExpiryTimeOfDay = expiryTimeOfDay;
-		expiryTimeOfDay = newExpiryTimeOfDay;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY, oldExpiryTimeOfDay, newExpiryTimeOfDay);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCache#getExpiryTimeOfDay <em>Expiry Time Of Day</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expiry Time Of Day</em>' containment reference.
-	 * @see #getExpiryTimeOfDay()
-	 * @generated
-	 */
-	public void setExpiryTimeOfDay(XmlTimeOfDay newExpiryTimeOfDay)
-	{
-		if (newExpiryTimeOfDay != expiryTimeOfDay)
-		{
-			NotificationChain msgs = null;
-			if (expiryTimeOfDay != null)
-				msgs = ((InternalEObject)expiryTimeOfDay).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY, null, msgs);
-			if (newExpiryTimeOfDay != null)
-				msgs = ((InternalEObject)newExpiryTimeOfDay).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY, null, msgs);
-			msgs = basicSetExpiryTimeOfDay(newExpiryTimeOfDay, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY, newExpiryTimeOfDay, newExpiryTimeOfDay));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY:
-				return basicSetExpiryTimeOfDay(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 EclipseLinkOrmPackage.XML_CACHE__EXPIRY:
-				return getExpiry();
-			case EclipseLinkOrmPackage.XML_CACHE__SIZE:
-				return getSize();
-			case EclipseLinkOrmPackage.XML_CACHE__SHARED:
-				return getShared();
-			case EclipseLinkOrmPackage.XML_CACHE__TYPE:
-				return getType();
-			case EclipseLinkOrmPackage.XML_CACHE__ALWAYS_REFRESH:
-				return getAlwaysRefresh();
-			case EclipseLinkOrmPackage.XML_CACHE__REFRESH_ONLY_IF_NEWER:
-				return getRefreshOnlyIfNewer();
-			case EclipseLinkOrmPackage.XML_CACHE__DISABLE_HITS:
-				return getDisableHits();
-			case EclipseLinkOrmPackage.XML_CACHE__COORDINATION_TYPE:
-				return getCoordinationType();
-			case EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY:
-				return getExpiryTimeOfDay();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CACHE__EXPIRY:
-				setExpiry((Integer)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__SIZE:
-				setSize((Integer)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__SHARED:
-				setShared((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__TYPE:
-				setType((CacheType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__ALWAYS_REFRESH:
-				setAlwaysRefresh((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__REFRESH_ONLY_IF_NEWER:
-				setRefreshOnlyIfNewer((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__DISABLE_HITS:
-				setDisableHits((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__COORDINATION_TYPE:
-				setCoordinationType((CacheCoordinationType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY:
-				setExpiryTimeOfDay((XmlTimeOfDay)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CACHE__EXPIRY:
-				setExpiry(EXPIRY_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__SIZE:
-				setSize(SIZE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__SHARED:
-				setShared(SHARED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__ALWAYS_REFRESH:
-				setAlwaysRefresh(ALWAYS_REFRESH_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__REFRESH_ONLY_IF_NEWER:
-				setRefreshOnlyIfNewer(REFRESH_ONLY_IF_NEWER_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__DISABLE_HITS:
-				setDisableHits(DISABLE_HITS_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__COORDINATION_TYPE:
-				setCoordinationType(COORDINATION_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY:
-				setExpiryTimeOfDay((XmlTimeOfDay)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CACHE__EXPIRY:
-				return EXPIRY_EDEFAULT == null ? expiry != null : !EXPIRY_EDEFAULT.equals(expiry);
-			case EclipseLinkOrmPackage.XML_CACHE__SIZE:
-				return SIZE_EDEFAULT == null ? size != null : !SIZE_EDEFAULT.equals(size);
-			case EclipseLinkOrmPackage.XML_CACHE__SHARED:
-				return SHARED_EDEFAULT == null ? shared != null : !SHARED_EDEFAULT.equals(shared);
-			case EclipseLinkOrmPackage.XML_CACHE__TYPE:
-				return type != TYPE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_CACHE__ALWAYS_REFRESH:
-				return ALWAYS_REFRESH_EDEFAULT == null ? alwaysRefresh != null : !ALWAYS_REFRESH_EDEFAULT.equals(alwaysRefresh);
-			case EclipseLinkOrmPackage.XML_CACHE__REFRESH_ONLY_IF_NEWER:
-				return REFRESH_ONLY_IF_NEWER_EDEFAULT == null ? refreshOnlyIfNewer != null : !REFRESH_ONLY_IF_NEWER_EDEFAULT.equals(refreshOnlyIfNewer);
-			case EclipseLinkOrmPackage.XML_CACHE__DISABLE_HITS:
-				return DISABLE_HITS_EDEFAULT == null ? disableHits != null : !DISABLE_HITS_EDEFAULT.equals(disableHits);
-			case EclipseLinkOrmPackage.XML_CACHE__COORDINATION_TYPE:
-				return coordinationType != COORDINATION_TYPE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_CACHE__EXPIRY_TIME_OF_DAY:
-				return expiryTimeOfDay != null;
-		}
-		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(" (expiry: ");
-		result.append(expiry);
-		result.append(", size: ");
-		result.append(size);
-		result.append(", shared: ");
-		result.append(shared);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", alwaysRefresh: ");
-		result.append(alwaysRefresh);
-		result.append(", refreshOnlyIfNewer: ");
-		result.append(refreshOnlyIfNewer);
-		result.append(", disableHits: ");
-		result.append(disableHits);
-		result.append(", coordinationType: ");
-		result.append(coordinationType);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildExpiryTranslator(),
-			buildExpiryTimeOfDayTranslator(),
-			buildSizeTranslator(),
-			buildSharedTranslator(),
-			buildTypeTranslator(),
-			buildAlwaysRefreshTranslator(),
-			buildRefreshOnlyIfNewerTranslator(),
-			buildDisableHitsTranslator(),
-			buildCoordinationTypeTranslator(),
-		};
-	}
-
-	protected static Translator buildExpiryTranslator() {
-		return new Translator(EclipseLink.CACHE__EXPIRY, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_Expiry());
-	}
-	
-	protected static Translator buildExpiryTimeOfDayTranslator() {
-		return XmlTimeOfDay.buildTranslator(EclipseLink.EXPIRY_TIME_OF_DAY, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_ExpiryTimeOfDay());
-	}
-	
-	protected static Translator buildSizeTranslator() {
-		return new Translator(EclipseLink.CACHE__SIZE, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_Size(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildSharedTranslator() {
-		return new Translator(EclipseLink.CACHE__SHARED, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_Shared(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildTypeTranslator() {
-		return new Translator(EclipseLink.CACHE__TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_Type(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildAlwaysRefreshTranslator() {
-		return new Translator(EclipseLink.CACHE__ALWAYS_REFRESH, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_AlwaysRefresh(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildRefreshOnlyIfNewerTranslator() {
-		return new Translator(EclipseLink.CACHE__REFRESH_ONLY_IF_NEWER, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_RefreshOnlyIfNewer(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildDisableHitsTranslator() {
-		return new Translator(EclipseLink.CACHE__DISABLE_HITS, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_DisableHits(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildCoordinationTypeTranslator() {
-		return new Translator(EclipseLink.CACHE__COORDINATION_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlCache_CoordinationType(), Translator.DOM_ATTRIBUTE);
-	}
-
-} // XmlCache
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
deleted file mode 100644
index f0a5c0de09..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheHolder.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Cache Holder</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder#getCache <em>Cache</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder#getExistenceChecking <em>Existence Checking</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlCacheHolder extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache</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>Cache</em>' containment reference.
-	 * @see #setCache(XmlCache)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_Cache()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlCache getCache();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder#getCache <em>Cache</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache</em>' containment reference.
-	 * @see #getCache()
-	 * @generated
-	 */
-	void setCache(XmlCache value);
-
-	/**
-	 * Returns the value of the '<em><b>Existence Checking</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Existence Checking</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Existence Checking</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-	 * @see #setExistenceChecking(ExistenceType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_ExistenceChecking()
-	 * @model default=""
-	 * @generated
-	 */
-	ExistenceType getExistenceChecking();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCacheHolder#getExistenceChecking <em>Existence Checking</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Existence Checking</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-	 * @see #getExistenceChecking()
-	 * @generated
-	 */
-	void setExistenceChecking(ExistenceType value);
-
-} // XmlCacheHolder
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
deleted file mode 100644
index aa252f224c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCacheIndex.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Cache Index</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheIndex()
- * @model kind="class"
- * @generated
- */
-public class XmlCacheIndex extends AbstractJpaEObject implements XmlCacheIndex_2_4
-{
-	/**
-	 * The cached value of the '{@link #getColumnNames() <em>Column Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumnNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> columnNames;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlCacheIndex()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CACHE_INDEX;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Names</em>' attribute list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheIndex_2_4_ColumnNames()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public EList<String> getColumnNames()
-	{
-		if (columnNames == null)
-		{
-			columnNames = new EDataTypeEList<String>(String.class, this, EclipseLinkOrmPackage.XML_CACHE_INDEX__COLUMN_NAMES);
-		}
-		return columnNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CACHE_INDEX__COLUMN_NAMES:
-				return getColumnNames();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CACHE_INDEX__COLUMN_NAMES:
-				getColumnNames().clear();
-				getColumnNames().addAll((Collection<? extends String>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CACHE_INDEX__COLUMN_NAMES:
-				getColumnNames().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CACHE_INDEX__COLUMN_NAMES:
-				return columnNames != null && !columnNames.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(" (columnNames: ");
-		result.append(columnNames);
-		result.append(')');
-		return result.toString();
-	}
-
-
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlCacheIndex(),
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildColumnNameTranslator()
-		};
-	}
-	
-	protected static Translator buildColumnNameTranslator() {
-		return new Translator(EclipseLink2_4.CACHE_INDEX__COLUMN_NAME, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlCacheIndex_2_4_ColumnNames());
-	}
-} // XmlCacheIndex
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
deleted file mode 100644
index e82bb7751e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTracking.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
-
- * A representation of the model object '<em><b>Xml Change Tracking</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlChangeTracking extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final XmlChangeTrackingType 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 XmlChangeTrackingType type = TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlChangeTracking()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CHANGE_TRACKING;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType}.
-	 * <!-- 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 org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType
-	 * @see #setType(XmlChangeTrackingType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTracking_Type()
-	 * @model
-	 * @generated
-	 */
-	public XmlChangeTrackingType getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTracking#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingType
-	 * @see #getType()
-	 * @generated
-	 */
-	public void setType(XmlChangeTrackingType newType)
-	{
-		XmlChangeTrackingType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CHANGE_TRACKING__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING__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 EclipseLinkOrmPackage.XML_CHANGE_TRACKING__TYPE:
-				setType((XmlChangeTrackingType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CHANGE_TRACKING__TYPE:
-				return type != 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(" (type: ");
-		result.append(type);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, Translator.END_TAG_NO_INDENT, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildTypeTranslator()
-		};
-	}
-	
-	protected static Translator buildTypeTranslator() {
-		return new Translator(EclipseLink.TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlChangeTracking_Type(), Translator.DOM_ATTRIBUTE);
-	}
-
-} // XmlChangeTracking
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
deleted file mode 100644
index 3144406326..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingHolder.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Change Tracking Holder</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder#getChangeTracking <em>Change Tracking</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlChangeTrackingHolder extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Change Tracking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Change Tracking</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>Change Tracking</em>' containment reference.
-	 * @see #setChangeTracking(XmlChangeTracking)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder_ChangeTracking()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlChangeTracking getChangeTracking();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlChangeTrackingHolder#getChangeTracking <em>Change Tracking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Tracking</em>' containment reference.
-	 * @see #getChangeTracking()
-	 * @generated
-	 */
-	void setChangeTracking(XmlChangeTracking value);
-
-} // XmlChangeTrackingHolder
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingType.java
deleted file mode 100644
index 02a765c6fa..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlChangeTrackingType.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-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>Xml Change Tracking Type</b></em>',
- * and utility methods for working with them.
- *  
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingType()
- * @model
- * @generated
- */
-public enum XmlChangeTrackingType implements Enumerator
-{
-	/**
-	 * The '<em><b>ATTRIBUTE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ATTRIBUTE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ATTRIBUTE(0, "ATTRIBUTE", "ATTRIBUTE"), /**
-	 * The '<em><b>OBJECT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OBJECT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OBJECT(1, "OBJECT", "OBJECT"), /**
-	 * The '<em><b>DEFERRED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DEFERRED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DEFERRED(2, "DEFERRED", "DEFERRED"), /**
-	 * The '<em><b>AUTO</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #AUTO_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	AUTO(3, "AUTO", "AUTO")
-	;
-
-	/**
-	 * The '<em><b>ATTRIBUTE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ATTRIBUTE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ATTRIBUTE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ATTRIBUTE_VALUE = 0;
-
-/**
-	 * The '<em><b>OBJECT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OBJECT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OBJECT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OBJECT_VALUE = 1;
-
-/**
-	 * The '<em><b>DEFERRED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DEFERRED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DEFERRED
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DEFERRED_VALUE = 2;
-
-/**
-	 * The '<em><b>AUTO</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>AUTO</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AUTO
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int AUTO_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>Xml Change Tracking Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final XmlChangeTrackingType[] VALUES_ARRAY =
-		new XmlChangeTrackingType[]
-		{
-			ATTRIBUTE,
-			OBJECT,
-			DEFERRED,
-			AUTO,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Xml Change Tracking Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<XmlChangeTrackingType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Xml Change Tracking Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlChangeTrackingType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlChangeTrackingType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Change Tracking Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlChangeTrackingType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlChangeTrackingType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Change Tracking Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlChangeTrackingType get(int value)
-	{
-		switch (value)
-		{
-			case ATTRIBUTE_VALUE: return ATTRIBUTE;
-			case OBJECT_VALUE: return OBJECT;
-			case DEFERRED_VALUE: return DEFERRED;
-			case AUTO_VALUE: return AUTO;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private XmlChangeTrackingType(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;
-	}
-	
-} //XmlChangeTrackingType
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
deleted file mode 100644
index 772affa448..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCloneCopyPolicy.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Clone Copy Policy</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.2
- * @since 2.2
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getMethod <em>Method</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getWorkingCopyMethod <em>Working Copy Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlCloneCopyPolicy extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * 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 #getWorkingCopyMethod() <em>Working Copy Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkingCopyMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WORKING_COPY_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWorkingCopyMethod() <em>Working Copy Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWorkingCopyMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String workingCopyMethod = WORKING_COPY_METHOD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlCloneCopyPolicy()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CLONE_COPY_POLICY;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy_Method()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getMethod()
-	{
-		return method;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy#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, EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__METHOD, oldMethod, method));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Working Copy Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Working Copy 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>Working Copy Method</em>' attribute.
-	 * @see #setWorkingCopyMethod(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCloneCopyPolicy_WorkingCopyMethod()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getWorkingCopyMethod()
-	{
-		return workingCopyMethod;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCloneCopyPolicy#getWorkingCopyMethod <em>Working Copy Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Working Copy Method</em>' attribute.
-	 * @see #getWorkingCopyMethod()
-	 * @generated
-	 */
-	public void setWorkingCopyMethod(String newWorkingCopyMethod)
-	{
-		String oldWorkingCopyMethod = workingCopyMethod;
-		workingCopyMethod = newWorkingCopyMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD, oldWorkingCopyMethod, workingCopyMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__METHOD:
-				return getMethod();
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD:
-				return getWorkingCopyMethod();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__METHOD:
-				setMethod((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD:
-				setWorkingCopyMethod((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__METHOD:
-				setMethod(METHOD_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD:
-				setWorkingCopyMethod(WORKING_COPY_METHOD_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__METHOD:
-				return METHOD_EDEFAULT == null ? method != null : !METHOD_EDEFAULT.equals(method);
-			case EclipseLinkOrmPackage.XML_CLONE_COPY_POLICY__WORKING_COPY_METHOD:
-				return WORKING_COPY_METHOD_EDEFAULT == null ? workingCopyMethod != null : !WORKING_COPY_METHOD_EDEFAULT.equals(workingCopyMethod);
-		}
-		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(", workingCopyMethod: ");
-		result.append(workingCopyMethod);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildMethodTranslator(),
-			buildWorkingCopyMethodTranslator(),
-		};
-	}
-	
-	protected static Translator buildMethodTranslator() {
-		return new Translator(EclipseLink.CLONE_COPY_POLICY__METHOD, EclipseLinkOrmPackage.eINSTANCE.getXmlCloneCopyPolicy_Method(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildWorkingCopyMethodTranslator() {
-		return new Translator(EclipseLink.CLONE_COPY_POLICY__WORKING_COPY_METHOD, EclipseLinkOrmPackage.eINSTANCE.getXmlCloneCopyPolicy_WorkingCopyMethod(), Translator.DOM_ATTRIBUTE);
-	}
-	
-} // XmlCloneCopyPolicy
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
deleted file mode 100644
index ec331f1139..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCollectionTable.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Collection Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionTable()
- * @model kind="class"
- * @generated
- */
-public class XmlCollectionTable extends org.eclipse.jpt.jpa.core.resource.orm.XmlCollectionTable implements XmlCollectionTable_2_2
-{
-	/**
-	 * The default value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CREATION_SUFFIX_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected String creationSuffix = CREATION_SUFFIX_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlCollectionTable()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_COLLECTION_TABLE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionTable_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCreationSuffix()
-	{
-		return creationSuffix;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCollectionTable#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	public void setCreationSuffix(String newCreationSuffix)
-	{
-		String oldCreationSuffix = creationSuffix;
-		creationSuffix = newCreationSuffix;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_COLLECTION_TABLE__CREATION_SUFFIX, oldCreationSuffix, creationSuffix));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_COLLECTION_TABLE__CREATION_SUFFIX:
-				return getCreationSuffix();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_COLLECTION_TABLE__CREATION_SUFFIX:
-				setCreationSuffix((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_COLLECTION_TABLE__CREATION_SUFFIX:
-				setCreationSuffix(CREATION_SUFFIX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_COLLECTION_TABLE__CREATION_SUFFIX:
-				return CREATION_SUFFIX_EDEFAULT == null ? creationSuffix != null : !CREATION_SUFFIX_EDEFAULT.equals(creationSuffix);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlCollectionTable_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_COLLECTION_TABLE__CREATION_SUFFIX: return EclipseLinkOrmV2_2Package.XML_COLLECTION_TABLE_22__CREATION_SUFFIX;
-				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 == XmlCollectionTable_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_COLLECTION_TABLE_22__CREATION_SUFFIX: return EclipseLinkOrmPackage.XML_COLLECTION_TABLE__CREATION_SUFFIX;
-				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(" (creationSuffix: ");
-		result.append(creationSuffix);
-		result.append(')');
-		return result.toString();
-	}
-
-
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlCollectionTable(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildCatalogTranslator(),
-			buildSchemaTranslator(),
-			buildCreationSuffixTranslator(),
-			buildJoinColumnTranslator(),
-			buildUniqueConstraintTranslator()};
-	}
-	
-	protected static Translator buildCreationSuffixTranslator() {
-		return new Translator(EclipseLink2_2.CREATION_SUFFIX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlCollectionTable_2_2_CreationSuffix(), Translator.DOM_ATTRIBUTE);
-	}
-
-} // XmlCollectionTable
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
deleted file mode 100644
index d746c9261e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConversionValue.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Conversion Value</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue#getDataValue <em>Data Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue#getObjectValue <em>Object Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlConversionValue extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getDataValue() <em>Data Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DATA_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDataValue() <em>Data Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dataValue = DATA_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getObjectValue() <em>Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OBJECT_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getObjectValue() <em>Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String objectValue = OBJECT_VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlConversionValue()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CONVERSION_VALUE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Data Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Data 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>Data Value</em>' attribute.
-	 * @see #setDataValue(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue_DataValue()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDataValue()
-	{
-		return dataValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue#getDataValue <em>Data Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data Value</em>' attribute.
-	 * @see #getDataValue()
-	 * @generated
-	 */
-	public void setDataValue(String newDataValue)
-	{
-		String oldDataValue = dataValue;
-		dataValue = newDataValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE, oldDataValue, dataValue));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object 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>Object Value</em>' attribute.
-	 * @see #setObjectValue(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue_ObjectValue()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getObjectValue()
-	{
-		return objectValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue#getObjectValue <em>Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Value</em>' attribute.
-	 * @see #getObjectValue()
-	 * @generated
-	 */
-	public void setObjectValue(String newObjectValue)
-	{
-		String oldObjectValue = objectValue;
-		objectValue = newObjectValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE, oldObjectValue, objectValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE:
-				return getDataValue();
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE:
-				return getObjectValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE:
-				setDataValue((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE:
-				setObjectValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE:
-				setDataValue(DATA_VALUE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE:
-				setObjectValue(OBJECT_VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE:
-				return DATA_VALUE_EDEFAULT == null ? dataValue != null : !DATA_VALUE_EDEFAULT.equals(dataValue);
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE:
-				return OBJECT_VALUE_EDEFAULT == null ? objectValue != null : !OBJECT_VALUE_EDEFAULT.equals(objectValue);
-		}
-		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(" (dataValue: ");
-		result.append(dataValue);
-		result.append(", objectValue: ");
-		result.append(objectValue);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getDataValueTextRange() {
-		return getAttributeTextRange(EclipseLink.CONVERSION_VALUE__DATA_VALUE);
-	}
-	
-	public TextRange getObjectValueTextRange() {
-		return getAttributeTextRange(EclipseLink.CONVERSION_VALUE__OBJECT_VALUE);
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName,
-			structuralFeature,
-			Translator.END_TAG_NO_INDENT,
-			buildTranslatorChildren()
-		);
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildDataValueTranslator(),
-			buildObjectValueTranslator()
-		};
-	}
-	
-	protected static Translator buildDataValueTranslator() {
-		return new Translator(EclipseLink.CONVERSION_VALUE__DATA_VALUE, EclipseLinkOrmPackage.eINSTANCE.getXmlConversionValue_DataValue(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildObjectValueTranslator() {
-		return new Translator(EclipseLink.CONVERSION_VALUE__OBJECT_VALUE, EclipseLinkOrmPackage.eINSTANCE.getXmlConversionValue_ObjectValue(), Translator.DOM_ATTRIBUTE);
-	}
-	
-} // XmlConversionValue
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverter.java
deleted file mode 100644
index 581f386de0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverter.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.jdt.core.IType;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml CustomConverter</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter#getClassName <em>Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter()
- * @model kind="class"
- * @generated
- */
-public class XmlConverter extends XmlNamedConverter
-{
-	/**
-	 * 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 XmlConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CONVERTER;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter_ClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getClassName()
-	{
-		return className;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	public void setClassName(String newClassName)
-	{
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERTER__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERTER__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 EclipseLinkOrmPackage.XML_CONVERTER__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 EclipseLinkOrmPackage.XML_CONVERTER__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 EclipseLinkOrmPackage.XML_CONVERTER__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();
-	}
-	
-	public TextRange getConverterClassTextRange() {
-		return getAttributeTextRange(EclipseLink.CONVERTER__CLASS);
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, Translator.END_TAG_NO_INDENT, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildClassTranslator(),
-		};
-	}
-	
-	protected static Translator buildClassTranslator() {
-		return new Translator(EclipseLink.CONVERTER__CLASS, EclipseLinkOrmPackage.eINSTANCE.getXmlConverter_ClassName(), Translator.DOM_ATTRIBUTE);
-	}
-
-
-	// ********** refactoring **********
-
-	public ReplaceEdit createRenameEdit(IType originalType, String newName) {
-		String originalName = originalType.getTypeQualifiedName();
-		int nameIndex = this.className.lastIndexOf(originalName);
-		int offset = getAttributeNode(EclipseLink.CONVERTER__CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
-	}
-
-	public ReplaceEdit createRenamePackageEdit(String newName) {
-		int packageLength = this.className.lastIndexOf('.');
-		if (packageLength == -1) {
-			packageLength = 0;
-			newName = newName + '.';
-		}
-		int offset = getAttributeNode(EclipseLink.CONVERTER__CLASS).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset, packageLength, newName);
-	}
-
-} // XmlConverter
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterHolder.java
deleted file mode 100644
index 9f46330a1e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConverterHolder.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml CustomConverter Holder</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getConverter <em>Converter</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getTypeConverter <em>Type Converter</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getObjectTypeConverter <em>Object Type Converter</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getStructConverter <em>Struct Converter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlConverterHolder
-	extends JpaEObject
-{
-// TODO bjv rename to XmlConverterContainer
-	/**
-	 * Returns the value of the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>CustomConverter</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>Converter</em>' containment reference.
-	 * @see #setConverter(XmlConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlConverter getConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getConverter <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter</em>' containment reference.
-	 * @see #getConverter()
-	 * @generated
-	 */
-	void setConverter(XmlConverter value);
-
-	/**
-	 * Returns the value of the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type CustomConverter</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>Type Converter</em>' containment reference.
-	 * @see #setTypeConverter(XmlTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlTypeConverter getTypeConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getTypeConverter <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Converter</em>' containment reference.
-	 * @see #getTypeConverter()
-	 * @generated
-	 */
-	void setTypeConverter(XmlTypeConverter value);
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type CustomConverter</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>Object Type Converter</em>' containment reference.
-	 * @see #setObjectTypeConverter(XmlObjectTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlObjectTypeConverter getObjectTypeConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type Converter</em>' containment reference.
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 */
-	void setObjectTypeConverter(XmlObjectTypeConverter value);
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct CustomConverter</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>Struct Converter</em>' containment reference.
-	 * @see #setStructConverter(XmlStructConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlStructConverter getStructConverter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder#getStructConverter <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct Converter</em>' containment reference.
-	 * @see #getStructConverter()
-	 * @generated
-	 */
-	void setStructConverter(XmlStructConverter value);
-
-} // XmlConverterHolder
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConvertersHolder.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConvertersHolder.java
deleted file mode 100644
index ff870ef339..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConvertersHolder.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Converters Holder</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getConverters <em>Converters</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getTypeConverters <em>Type Converters</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getObjectTypeConverters <em>Object Type Converters</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder#getStructConverters <em>Struct Converters</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlConvertersHolder extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converters</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>Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_Converters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlConverter> getConverters();
-
-	/**
-	 * Returns the value of the '<em><b>Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converters</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>Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_TypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlTypeConverter> getTypeConverters();
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converters</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>Object Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_ObjectTypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlObjectTypeConverter> getObjectTypeConverters();
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converters</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>Struct Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_StructConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlStructConverter> getStructConverters();
-
-} // XmlConvertersHolder
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConvertibleMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConvertibleMapping.java
deleted file mode 100644
index b3d9d5869c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlConvertibleMapping.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Convertible Mapping</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping#getConvert <em>Convert</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlConvertibleMapping extends org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping, XmlConverterHolder
-{
-	/**
-	 * Returns the value of the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Convert</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>Convert</em>' attribute.
-	 * @see #setConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getConvert();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping#getConvert <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Convert</em>' attribute.
-	 * @see #getConvert()
-	 * @generated
-	 */
-	void setConvert(String value);
-
-	/**
-	 * Return the {@link TextRange} for the convert element.  If the convert element 
-	 * does not exist return the {@link TextRange} for the mapping element.
-	 */
-	TextRange getConvertTextRange();
-
-} // XmlConvertibleMapping
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
deleted file mode 100644
index 9b21b431a1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCopyPolicy.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Copy Policy</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.2
- * @since 2.2
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy#getClass_ <em>Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCopyPolicy()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlCopyPolicy extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClass_()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClass_()
-	 * @generated
-	 * @ordered
-	 */
-	protected String class_ = CLASS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlCopyPolicy()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_COPY_POLICY;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Class</em>' attribute.
-	 * @see #setClass(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCopyPolicy_Class()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getClass_()
-	{
-		return class_;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCopyPolicy#getClass_ <em>Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class</em>' attribute.
-	 * @see #getClass_()
-	 * @generated
-	 */
-	public void setClass(String newClass)
-	{
-		String oldClass = class_;
-		class_ = newClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_COPY_POLICY__CLASS, oldClass, class_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_COPY_POLICY__CLASS:
-				return getClass_();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_COPY_POLICY__CLASS:
-				setClass((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_COPY_POLICY__CLASS:
-				setClass(CLASS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_COPY_POLICY__CLASS:
-				return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-		}
-		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(" (class: ");
-		result.append(class_);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildClassTranslator()
-		};
-	}
-	
-	protected static Translator buildClassTranslator() {
-		return new Translator(EclipseLink.COPY_POLICY__CLASS, EclipseLinkOrmPackage.eINSTANCE.getXmlCopyPolicy_Class(), Translator.DOM_ATTRIBUTE);
-	}
-	
-} // XmlCopyPolicy
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
deleted file mode 100644
index 89c35476dd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizer.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Customizer</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer#getCustomizerClassName <em>Customizer Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlCustomizer extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getCustomizerClassName() <em>Customizer Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizerClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOMIZER_CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomizerClassName() <em>Customizer Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizerClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String customizerClassName = CUSTOMIZER_CLASS_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlCustomizer()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CUSTOMIZER;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Customizer Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Customizer 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>Customizer Class Name</em>' attribute.
-	 * @see #setCustomizerClassName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizer_CustomizerClassName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCustomizerClassName()
-	{
-		return customizerClassName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizer#getCustomizerClassName <em>Customizer Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Customizer Class Name</em>' attribute.
-	 * @see #getCustomizerClassName()
-	 * @generated
-	 */
-	public void setCustomizerClassName(String newCustomizerClassName)
-	{
-		String oldCustomizerClassName = customizerClassName;
-		customizerClassName = newCustomizerClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME, oldCustomizerClassName, customizerClassName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME:
-				return getCustomizerClassName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME:
-				setCustomizerClassName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME:
-				setCustomizerClassName(CUSTOMIZER_CLASS_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CUSTOMIZER__CUSTOMIZER_CLASS_NAME:
-				return CUSTOMIZER_CLASS_NAME_EDEFAULT == null ? customizerClassName != null : !CUSTOMIZER_CLASS_NAME_EDEFAULT.equals(customizerClassName);
-		}
-		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(" (customizerClassName: ");
-		result.append(customizerClassName);
-		result.append(')');
-		return result.toString();
-	}
-
-} // XmlCustomizer
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
deleted file mode 100644
index 65349782cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlCustomizerHolder.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Customizer Holder</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder#getCustomizer <em>Customizer</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlCustomizerHolder extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Customizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Customizer</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>Customizer</em>' containment reference.
-	 * @see #setCustomizer(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder_Customizer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlClassReference getCustomizer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlCustomizerHolder#getCustomizer <em>Customizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Customizer</em>' containment reference.
-	 * @see #getCustomizer()
-	 * @generated
-	 */
-	void setCustomizer(XmlClassReference value);
-
-} // XmlCustomizerHolder
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlDirection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlDirection.java
deleted file mode 100644
index 07c7801060..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlDirection.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-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>Xml Direction</b></em>',
- * and utility methods for working with them.
- *  
- * 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.
- * 
- * @version 2.2
- * @since 2.2
- *
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlDirection()
- * @model
- * @generated
- */
-public enum XmlDirection implements Enumerator
-{
-	/**
-	 * The '<em><b>IN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IN_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IN(0, "IN", "IN"),
-
-	/**
-	 * The '<em><b>OUT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OUT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OUT(1, "OUT", "OUT"),
-
-	/**
-	 * The '<em><b>IN OUT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IN_OUT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IN_OUT(2, "IN_OUT", "IN_OUT"),
-
-	/**
-	 * The '<em><b>OUT CURSOR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OUT_CURSOR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OUT_CURSOR(3, "OUT_CURSOR", "OUT_CURSOR");
-
-	/**
-	 * The '<em><b>IN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>IN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IN
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IN_VALUE = 0;
-
-	/**
-	 * The '<em><b>OUT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OUT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OUT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OUT_VALUE = 1;
-
-	/**
-	 * The '<em><b>IN OUT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>IN OUT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IN_OUT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IN_OUT_VALUE = 2;
-
-	/**
-	 * The '<em><b>OUT CURSOR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OUT CURSOR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OUT_CURSOR
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OUT_CURSOR_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>Xml Direction</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final XmlDirection[] VALUES_ARRAY =
-		new XmlDirection[]
-		{
-			IN,
-			OUT,
-			IN_OUT,
-			OUT_CURSOR,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Xml Direction</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<XmlDirection> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Xml Direction</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlDirection get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlDirection result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Direction</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlDirection getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlDirection result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Direction</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlDirection get(int value)
-	{
-		switch (value)
-		{
-			case IN_VALUE: return IN;
-			case OUT_VALUE: return OUT;
-			case IN_OUT_VALUE: return IN_OUT;
-			case OUT_CURSOR_VALUE: return OUT_CURSOR;
-		}
-		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 XmlDirection(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;
-	}
-	
-} //XmlDirection
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java
deleted file mode 100644
index 7cf943227d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlElementCollection.java
+++ /dev/null
@@ -1,2654 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009, 2011 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.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.XmlAssociationOverride;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn;
-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.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.XmlCollectionMapping_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0;
-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.XmlElementCollection_2_1;
-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.XmlElementCollection_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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.XmlElementCollection_2_3;
-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.XmlElementCollection_2_4;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Element Collection</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection()
- * @model kind="class"
- * @generated
- */
-public class XmlElementCollection extends org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection implements XmlElementCollection_2_0, XmlElementCollection_2_1, XmlElementCollection_2_2, XmlElementCollection_2_3, XmlElementCollection_2_4
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlConverter converter;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTypeConverter typeConverter;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlObjectTypeConverter objectTypeConverter;
-
-	/**
-	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlStructConverter structConverter;
-
-	/**
-	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONVERT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String convert = CONVERT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConverters() <em>Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlConverter> converters;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTypeConverter> typeConverters;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverters() <em>Object Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlObjectTypeConverter> objectTypeConverters;
-
-	/**
-	 * The cached value of the '{@link #getStructConverters() <em>Struct Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlStructConverter> structConverters;
-
-	/**
-	 * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyAssociationOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
-
-	/**
-	 * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBatchFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlBatchFetch batchFetch;
-
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPartitioning_2_2 partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReplicationPartitioning_2_2 replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRangePartitioning_2_2 rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlValuePartitioning_2_2 valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlHashPartitioning_2_2 hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlUnionPartitioning_2_2 unionPartitioning;
-
-	/**
-	 * The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARTITIONED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected String partitioned = PARTITIONED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CASCADE_ON_DELETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cascadeOnDelete = CASCADE_ON_DELETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNoncacheable() <em>Noncacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNoncacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NONCACHEABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNoncacheable() <em>Noncacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNoncacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean noncacheable = NONCACHEABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCompositeMember() <em>Composite Member</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompositeMember()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMPOSITE_MEMBER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCompositeMember() <em>Composite Member</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompositeMember()
-	 * @generated
-	 * @ordered
-	 */
-	protected String compositeMember = COMPOSITE_MEMBER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDeleteAll() <em>Delete All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDeleteAll()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DELETE_ALL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDeleteAll() <em>Delete All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDeleteAll()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean deleteAll = DELETE_ALL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlElementCollection()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ELEMENT_COLLECTION;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converter</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>Converter</em>' containment reference.
-	 * @see #setConverter(XmlConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlConverter getConverter()
-	{
-		return converter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetConverter(XmlConverter newConverter, NotificationChain msgs)
-	{
-		XmlConverter oldConverter = converter;
-		converter = newConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getConverter <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter</em>' containment reference.
-	 * @see #getConverter()
-	 * @generated
-	 */
-	public void setConverter(XmlConverter newConverter)
-	{
-		if (newConverter != converter)
-		{
-			NotificationChain msgs = null;
-			if (converter != null)
-				msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER, newConverter, newConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converter</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>Type Converter</em>' containment reference.
-	 * @see #setTypeConverter(XmlTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTypeConverter getTypeConverter()
-	{
-		return typeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTypeConverter(XmlTypeConverter newTypeConverter, NotificationChain msgs)
-	{
-		XmlTypeConverter oldTypeConverter = typeConverter;
-		typeConverter = newTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getTypeConverter <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Converter</em>' containment reference.
-	 * @see #getTypeConverter()
-	 * @generated
-	 */
-	public void setTypeConverter(XmlTypeConverter newTypeConverter)
-	{
-		if (newTypeConverter != typeConverter)
-		{
-			NotificationChain msgs = null;
-			if (typeConverter != null)
-				msgs = ((InternalEObject)typeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER, null, msgs);
-			msgs = basicSetTypeConverter(newTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER, newTypeConverter, newTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converter</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>Object Type Converter</em>' containment reference.
-	 * @see #setObjectTypeConverter(XmlObjectTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlObjectTypeConverter getObjectTypeConverter()
-	{
-		return objectTypeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter, NotificationChain msgs)
-	{
-		XmlObjectTypeConverter oldObjectTypeConverter = objectTypeConverter;
-		objectTypeConverter = newObjectTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER, oldObjectTypeConverter, newObjectTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type Converter</em>' containment reference.
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 */
-	public void setObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter)
-	{
-		if (newObjectTypeConverter != objectTypeConverter)
-		{
-			NotificationChain msgs = null;
-			if (objectTypeConverter != null)
-				msgs = ((InternalEObject)objectTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER, null, msgs);
-			msgs = basicSetObjectTypeConverter(newObjectTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER, newObjectTypeConverter, newObjectTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converter</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>Struct Converter</em>' containment reference.
-	 * @see #setStructConverter(XmlStructConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlStructConverter getStructConverter()
-	{
-		return structConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStructConverter(XmlStructConverter newStructConverter, NotificationChain msgs)
-	{
-		XmlStructConverter oldStructConverter = structConverter;
-		structConverter = newStructConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getStructConverter <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct Converter</em>' containment reference.
-	 * @see #getStructConverter()
-	 * @generated
-	 */
-	public void setStructConverter(XmlStructConverter newStructConverter)
-	{
-		if (newStructConverter != structConverter)
-		{
-			NotificationChain msgs = null;
-			if (structConverter != null)
-				msgs = ((InternalEObject)structConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER, null, msgs);
-			msgs = basicSetStructConverter(newStructConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER, newStructConverter, newStructConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Convert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Convert</em>' attribute.
-	 * @see #setConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getConvert()
-	{
-		return convert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getConvert <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Convert</em>' attribute.
-	 * @see #getConvert()
-	 * @generated
-	 */
-	public void setConvert(String newConvert)
-	{
-		String oldConvert = convert;
-		convert = newConvert;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERT, oldConvert, convert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converters</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>Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_Converters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlConverter> getConverters()
-	{
-		if (converters == null)
-		{
-			converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS);
-		}
-		return converters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converters</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>Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_TypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTypeConverter> getTypeConverters()
-	{
-		if (typeConverters == null)
-		{
-			typeConverters = new EObjectContainmentEList<XmlTypeConverter>(XmlTypeConverter.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS);
-		}
-		return typeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converters</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>Object Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_ObjectTypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlObjectTypeConverter> getObjectTypeConverters()
-	{
-		if (objectTypeConverters == null)
-		{
-			objectTypeConverters = new EObjectContainmentEList<XmlObjectTypeConverter>(XmlObjectTypeConverter.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS);
-		}
-		return objectTypeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converters</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>Struct Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_StructConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlStructConverter> getStructConverters()
-	{
-		if (structConverters == null)
-		{
-			structConverters = new EObjectContainmentEList<XmlStructConverter>(XmlStructConverter.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS);
-		}
-		return structConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key Association Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
-	{
-		if (mapKeyAssociationOverrides == null)
-		{
-			mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES);
-		}
-		return mapKeyAssociationOverrides;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key Convert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key Convert</em>' attribute.
-	 * @see #setMapKeyConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionMapping_2_0_MapKeyConvert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getMapKeyConvert()
-	{
-		return mapKeyConvert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getMapKeyConvert <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map Key Convert</em>' attribute.
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 */
-	public void setMapKeyConvert(String newMapKeyConvert)
-	{
-		String oldMapKeyConvert = mapKeyConvert;
-		mapKeyConvert = newMapKeyConvert;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT, oldMapKeyConvert, mapKeyConvert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Fetch</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getJoinFetch <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #getJoinFetch()
-	 * @generated
-	 */
-	public void setJoinFetch(XmlJoinFetchType newJoinFetch)
-	{
-		XmlJoinFetchType oldJoinFetch = joinFetch;
-		joinFetch = newJoinFetch == null ? JOIN_FETCH_EDEFAULT : newJoinFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH, oldJoinFetch, joinFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference.
-	 * @see #setBatchFetch(XmlBatchFetch)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlBatchFetch getBatchFetch()
-	{
-		return batchFetch;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs)
-	{
-		XmlBatchFetch oldBatchFetch = batchFetch;
-		batchFetch = newBatchFetch;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH, oldBatchFetch, newBatchFetch);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getBatchFetch <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Fetch</em>' containment reference.
-	 * @see #getBatchFetch()
-	 * @generated
-	 */
-	public void setBatchFetch(XmlBatchFetch newBatchFetch)
-	{
-		if (newBatchFetch != batchFetch)
-		{
-			NotificationChain msgs = null;
-			if (batchFetch != null)
-				msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH, null, msgs);
-			if (newBatchFetch != null)
-				msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH, null, msgs);
-			msgs = basicSetBatchFetch(newBatchFetch, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH, newBatchFetch, newBatchFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPartitioning_2_2 getPartitioning()
-	{
-		return partitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
-	{
-		XmlPartitioning_2_2 oldPartitioning = partitioning;
-		partitioning = newPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING, oldPartitioning, newPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
-	{
-		if (newPartitioning != partitioning)
-		{
-			NotificationChain msgs = null;
-			if (partitioning != null)
-				msgs = ((InternalEObject)partitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING, null, msgs);
-			if (newPartitioning != null)
-				msgs = ((InternalEObject)newPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING, null, msgs);
-			msgs = basicSetPartitioning(newPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING, newPartitioning, newPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
-	{
-		return replicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
-	{
-		XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
-		replicationPartitioning = newReplicationPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING, oldReplicationPartitioning, newReplicationPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
-	{
-		if (newReplicationPartitioning != replicationPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (replicationPartitioning != null)
-				msgs = ((InternalEObject)replicationPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING, null, msgs);
-			if (newReplicationPartitioning != null)
-				msgs = ((InternalEObject)newReplicationPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING, null, msgs);
-			msgs = basicSetReplicationPartitioning(newReplicationPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING, newReplicationPartitioning, newReplicationPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
-	{
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
-	{
-		XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
-		roundRobinPartitioning = newRoundRobinPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING, oldRoundRobinPartitioning, newRoundRobinPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
-	{
-		if (newRoundRobinPartitioning != roundRobinPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (roundRobinPartitioning != null)
-				msgs = ((InternalEObject)roundRobinPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING, null, msgs);
-			if (newRoundRobinPartitioning != null)
-				msgs = ((InternalEObject)newRoundRobinPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING, null, msgs);
-			msgs = basicSetRoundRobinPartitioning(newRoundRobinPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING, newRoundRobinPartitioning, newRoundRobinPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
-	{
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
-	{
-		XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
-		pinnedPartitioning = newPinnedPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING, oldPinnedPartitioning, newPinnedPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
-	{
-		if (newPinnedPartitioning != pinnedPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (pinnedPartitioning != null)
-				msgs = ((InternalEObject)pinnedPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING, null, msgs);
-			if (newPinnedPartitioning != null)
-				msgs = ((InternalEObject)newPinnedPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING, null, msgs);
-			msgs = basicSetPinnedPartitioning(newPinnedPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING, newPinnedPartitioning, newPinnedPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRangePartitioning_2_2 getRangePartitioning()
-	{
-		return rangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
-	{
-		XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
-		rangePartitioning = newRangePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING, oldRangePartitioning, newRangePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
-	{
-		if (newRangePartitioning != rangePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (rangePartitioning != null)
-				msgs = ((InternalEObject)rangePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING, null, msgs);
-			if (newRangePartitioning != null)
-				msgs = ((InternalEObject)newRangePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING, null, msgs);
-			msgs = basicSetRangePartitioning(newRangePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING, newRangePartitioning, newRangePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlValuePartitioning_2_2 getValuePartitioning()
-	{
-		return valuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
-	{
-		XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
-		valuePartitioning = newValuePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING, oldValuePartitioning, newValuePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
-	{
-		if (newValuePartitioning != valuePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (valuePartitioning != null)
-				msgs = ((InternalEObject)valuePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING, null, msgs);
-			if (newValuePartitioning != null)
-				msgs = ((InternalEObject)newValuePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING, null, msgs);
-			msgs = basicSetValuePartitioning(newValuePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING, newValuePartitioning, newValuePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlHashPartitioning_2_2 getHashPartitioning()
-	{
-		return hashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
-	{
-		XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
-		hashPartitioning = newHashPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING, oldHashPartitioning, newHashPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
-	{
-		if (newHashPartitioning != hashPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (hashPartitioning != null)
-				msgs = ((InternalEObject)hashPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING, null, msgs);
-			if (newHashPartitioning != null)
-				msgs = ((InternalEObject)newHashPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING, null, msgs);
-			msgs = basicSetHashPartitioning(newHashPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING, newHashPartitioning, newHashPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlUnionPartitioning_2_2 getUnionPartitioning()
-	{
-		return unionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
-	{
-		XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
-		unionPartitioning = newUnionPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING, oldUnionPartitioning, newUnionPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
-	{
-		if (newUnionPartitioning != unionPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (unionPartitioning != null)
-				msgs = ((InternalEObject)unionPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING, null, msgs);
-			if (newUnionPartitioning != null)
-				msgs = ((InternalEObject)newUnionPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING, null, msgs);
-			msgs = basicSetUnionPartitioning(newUnionPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING, newUnionPartitioning, newUnionPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPartitioned()
-	{
-		return partitioned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	public void setPartitioned(String newPartitioned)
-	{
-		String oldPartitioned = partitioned;
-		partitioned = newPartitioned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED, oldPartitioned, partitioned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCascadeOnDelete()
-	{
-		return cascadeOnDelete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	public void setCascadeOnDelete(Boolean newCascadeOnDelete)
-	{
-		Boolean oldCascadeOnDelete = cascadeOnDelete;
-		cascadeOnDelete = newCascadeOnDelete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CASCADE_ON_DELETE, oldCascadeOnDelete, cascadeOnDelete));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Noncacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Noncacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Noncacheable</em>' attribute.
-	 * @see #setNoncacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection_2_2_Noncacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isNoncacheable()
-	{
-		return noncacheable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#isNoncacheable <em>Noncacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Noncacheable</em>' attribute.
-	 * @see #isNoncacheable()
-	 * @generated
-	 */
-	public void setNoncacheable(boolean newNoncacheable)
-	{
-		boolean oldNoncacheable = noncacheable;
-		noncacheable = newNoncacheable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__NONCACHEABLE, oldNoncacheable, noncacheable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Composite Member</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Composite Member</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Composite Member</em>' attribute.
-	 * @see #setCompositeMember(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection_2_3_CompositeMember()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCompositeMember()
-	{
-		return compositeMember;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#getCompositeMember <em>Composite Member</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Composite Member</em>' attribute.
-	 * @see #getCompositeMember()
-	 * @generated
-	 */
-	public void setCompositeMember(String newCompositeMember)
-	{
-		String oldCompositeMember = compositeMember;
-		compositeMember = newCompositeMember;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER, oldCompositeMember, compositeMember));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Delete All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delete All</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delete All</em>' attribute.
-	 * @see #setDeleteAll(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlElementCollection_2_4_DeleteAll()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isDeleteAll()
-	{
-		return deleteAll;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlElementCollection#isDeleteAll <em>Delete All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delete All</em>' attribute.
-	 * @see #isDeleteAll()
-	 * @generated
-	 */
-	public void setDeleteAll(boolean newDeleteAll)
-	{
-		boolean oldDeleteAll = deleteAll;
-		deleteAll = newDeleteAll;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL, oldDeleteAll, deleteAll));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER:
-				return basicSetStructConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS:
-				return ((InternalEList<?>)getConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS:
-				return ((InternalEList<?>)getTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS:
-				return ((InternalEList<?>)getObjectTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS:
-				return ((InternalEList<?>)getStructConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return ((InternalEList<?>)getMapKeyAssociationOverrides()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH:
-				return basicSetBatchFetch(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING:
-				return basicSetPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING:
-				return basicSetReplicationPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING:
-				return basicSetRoundRobinPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING:
-				return basicSetPinnedPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING:
-				return basicSetRangePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING:
-				return basicSetValuePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING:
-				return basicSetHashPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING:
-				return basicSetUnionPartitioning(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 EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
-				return getConvert();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS:
-				return getConverters();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS:
-				return getTypeConverters();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS:
-				return getObjectTypeConverters();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS:
-				return getStructConverters();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return getMapKeyAssociationOverrides();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
-				return getMapKeyConvert();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH:
-				return getJoinFetch();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH:
-				return getBatchFetch();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED:
-				return getPartitioned();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CASCADE_ON_DELETE:
-				return getCascadeOnDelete();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__NONCACHEABLE:
-				return isNoncacheable();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER:
-				return getCompositeMember();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL:
-				return isDeleteAll();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
-				setConvert((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS:
-				getConverters().clear();
-				getConverters().addAll((Collection<? extends XmlConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				getTypeConverters().addAll((Collection<? extends XmlTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				getObjectTypeConverters().addAll((Collection<? extends XmlObjectTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				getStructConverters().addAll((Collection<? extends XmlStructConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
-				getMapKeyAssociationOverrides().clear();
-				getMapKeyAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
-				setMapKeyConvert((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED:
-				setPartitioned((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CASCADE_ON_DELETE:
-				setCascadeOnDelete((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__NONCACHEABLE:
-				setNoncacheable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER:
-				setCompositeMember((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL:
-				setDeleteAll((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS:
-				getConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
-				getMapKeyAssociationOverrides().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
-				setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED:
-				setPartitioned(PARTITIONED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CASCADE_ON_DELETE:
-				setCascadeOnDelete(CASCADE_ON_DELETE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__NONCACHEABLE:
-				setNoncacheable(NONCACHEABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER:
-				setCompositeMember(COMPOSITE_MEMBER_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL:
-				setDeleteAll(DELETE_ALL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS:
-				return converters != null && !converters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS:
-				return typeConverters != null && !typeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS:
-				return objectTypeConverters != null && !objectTypeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS:
-				return structConverters != null && !structConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty();
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT:
-				return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH:
-				return batchFetch != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING:
-				return partitioning != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING:
-				return pinnedPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING:
-				return rangePartitioning != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING:
-				return valuePartitioning != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING:
-				return hashPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING:
-				return unionPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED:
-				return PARTITIONED_EDEFAULT == null ? partitioned != null : !PARTITIONED_EDEFAULT.equals(partitioned);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CASCADE_ON_DELETE:
-				return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__NONCACHEABLE:
-				return noncacheable != NONCACHEABLE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER:
-				return COMPOSITE_MEMBER_EDEFAULT == null ? compositeMember != null : !COMPOSITE_MEMBER_EDEFAULT.equals(compositeMember);
-			case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL:
-				return deleteAll != DELETE_ALL_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCollectionMapping_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBatchFetchHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CASCADE_ON_DELETE: return EclipseLinkOrmV2_2Package.XML_ELEMENT_COLLECTION_22__CASCADE_ON_DELETE;
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__NONCACHEABLE: return EclipseLinkOrmV2_2Package.XML_ELEMENT_COLLECTION_22__NONCACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER: return EclipseLinkOrmV2_3Package.XML_ELEMENT_COLLECTION_23__COMPOSITE_MEMBER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_4.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL: return EclipseLinkOrmV2_4Package.XML_ELEMENT_COLLECTION_24__DELETE_ALL;
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCollectionMapping_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__MAP_KEY_CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__JOIN_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBatchFetchHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__UNION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_ELEMENT_COLLECTION_22__CASCADE_ON_DELETE: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__CASCADE_ON_DELETE;
-				case EclipseLinkOrmV2_2Package.XML_ELEMENT_COLLECTION_22__NONCACHEABLE: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__NONCACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_3Package.XML_ELEMENT_COLLECTION_23__COMPOSITE_MEMBER: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__COMPOSITE_MEMBER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlElementCollection_2_4.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_4Package.XML_ELEMENT_COLLECTION_24__DELETE_ALL: return EclipseLinkOrmPackage.XML_ELEMENT_COLLECTION__DELETE_ALL;
-				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(" (convert: ");
-		result.append(convert);
-		result.append(", mapKeyConvert: ");
-		result.append(mapKeyConvert);
-		result.append(", joinFetch: ");
-		result.append(joinFetch);
-		result.append(", attributeType: ");
-		result.append(attributeType);
-		result.append(", partitioned: ");
-		result.append(partitioned);
-		result.append(", cascadeOnDelete: ");
-		result.append(cascadeOnDelete);
-		result.append(", noncacheable: ");
-		result.append(noncacheable);
-		result.append(", compositeMember: ");
-		result.append(compositeMember);
-		result.append(", deleteAll: ");
-		result.append(deleteAll);
-		result.append(')');
-		return result.toString();
-	}
-	
-	
-	// ********** validation **********
-	
-	@Override
-	public TextRange getEnumeratedTextRange() {
-		return getAttributeTextRange(JPA.ENUMERATED);
-	}
-	
-	@Override
-	public TextRange getLobTextRange() {
-		return getAttributeTextRange(JPA.LOB);
-	}
-	
-	@Override
-	public TextRange getTemporalTextRange() {
-		return getAttributeTextRange(JPA.TEMPORAL);
-	}
-	
-	public TextRange getConvertTextRange() {
-		return getElementTextRange(EclipseLink.CONVERT);
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLink.JOIN_FETCH);
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlElementCollection(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildTargetClassTranslator(),
-			buildFetchTranslator(),
-			buildAccessTranslator(),
-			buildAttributeTypeTranslator(),
-			buildCompositeMemberTranslator(),
-			buildOrderByTranslator(),
-			buildOrderColumnTranslator(),		
-			buildMapKeyTranslator(),
-			buildMapKeyClassTranslator(),
-			buildMapKeyTemporalTranslator(),
-			buildMapKeyEnumeratedTranslator(),
-			buildMapKeyConvertTranslator(),
-			buildMapKeyAttributeOverrideTranslator(),
-			buildMapKeyAssociationOverrideTranslator(),
-			XmlColumn.buildTranslator(JPA2_0.MAP_KEY_COLUMN, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_MapKeyColumn()),
-			XmlJoinColumn.buildTranslator(JPA2_0.MAP_KEY_JOIN_COLUMN, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_MapKeyJoinColumns()),
-			XmlColumn.buildTranslator(JPA.COLUMN, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_Column()),
-			buildTemporalTranslator(),
-			buildEnumeratedTranslator(),
-			buildLobTranslator(),
-			buildConvertTranslator(),
-			buildAttributeOverrideTranslator(),
-			buildAssociationOverrideTranslator(),
-			XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_Converter()),
-			XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_TypeConverter()),
-			XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_ObjectTypeConverter()),
-			XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_StructConverter()),
-			XmlCollectionTable.buildTranslator(JPA2_0.COLLECTION_TABLE, OrmV2_0Package.eINSTANCE.getXmlElementCollection_2_0_CollectionTable()),
-			buildCascadeOnDeleteTranslator(),
-			buildJoinFetchTranslator(),
-			buildBatchFetchTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator(),
-			buildNoncacheableTranslator(),
-			buildDeleteAllTranslator(),
-		    XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioning()),
-			XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ReplicationPartitioning()),
-			XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RoundRobinPartitioning()),
-			XmlPinnedPartitioning.buildTranslator(EclipseLink2_2.PINNED_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_PinnedPartitioning()),
-			XmlRangePartitioning.buildTranslator(EclipseLink2_2.RANGE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RangePartitioning()),
-			XmlValuePartitioning.buildTranslator(EclipseLink2_2.VALUE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ValuePartitioning()),
-			XmlHashPartitioning.buildTranslator(EclipseLink2_2.HASH_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_HashPartitioning()),
-			XmlUnionPartitioning.buildTranslator(EclipseLink2_2.UNION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_UnionPartitioning()),
-		};
-	}
-	
-	protected static Translator buildMapKeyConvertTranslator() {
-		return new Translator(JPA2_0.MAP_KEY_CONVERT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCollectionMapping_2_0_MapKeyConvert());
-	}
-	
-	protected static Translator buildConvertTranslator() {
-		return new Translator(EclipseLink.CONVERT, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertibleMapping_Convert());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-	
-	protected static Translator buildMapKeyAssociationOverrideTranslator() {
-		return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides());
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlElementCollection_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildJoinFetchTranslator() {
-		return new Translator(EclipseLink.JOIN_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected static Translator buildBatchFetchTranslator() {
-		return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch());
-	}
-
-	protected static Translator buildCascadeOnDeleteTranslator() {
-		return CascadeType.buildTranslator(EclipseLink2_2.CASCADE_ON_DELETE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlElementCollection_2_2_CascadeOnDelete());
-	}
-	
-	protected static Translator buildNoncacheableTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink2_2.NONCACHEABLE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlElementCollection_2_2_Noncacheable());
-	}
-
-	protected static Translator buildCompositeMemberTranslator() {
-		return new Translator(EclipseLink2_3.COMPOSITE_MEMBER, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlElementCollection_2_3_CompositeMember(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildDeleteAllTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink2_4.DELETE_ALL, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlElementCollection_2_4_DeleteAll());
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java
deleted file mode 100644
index 190c71cf44..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddable.java
+++ /dev/null
@@ -1,1589 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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;
-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.orm.XmlAssociationOverride;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverrideContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverrideContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1;
-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.XmlEmbeddable_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.XmlEmbeddable_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Embeddable</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCopyPolicy <em>Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCloneCopyPolicy <em>Clone Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddable extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable implements XmlEmbeddable_2_1, XmlEmbeddable_2_2, XmlEmbeddable_2_3, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlConvertersHolder, XmlPropertyContainer
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getAttributeOverrides() <em>Attribute Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAttributeOverride> attributeOverrides;
-
-	/**
-	 * The cached value of the '{@link #getAssociationOverrides() <em>Association Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssociationOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAssociationOverride> associationOverrides;
-
-	/**
-	 * The default value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARENT_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String parentClass = PARENT_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPlsqlRecords() <em>Plsql Records</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlsqlRecords()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPlsqlRecord_2_3> plsqlRecords;
-
-	/**
-	 * The cached value of the '{@link #getPlsqlTables() <em>Plsql Tables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlsqlTables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPlsqlTable> plsqlTables;
-
-	/**
-	 * The cached value of the '{@link #getStruct() <em>Struct</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStruct()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlStruct_2_3 struct;
-
-	/**
-	 * The cached value of the '{@link #getCustomizer() <em>Customizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizer()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlClassReference customizer;
-
-	/**
-	 * The cached value of the '{@link #getChangeTracking() <em>Change Tracking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeTracking()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlChangeTracking changeTracking;
-
-	/**
-	 * The cached value of the '{@link #getConverters() <em>Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlConverter> converters;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTypeConverter> typeConverters;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverters() <em>Object Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlObjectTypeConverter> objectTypeConverters;
-
-	/**
-	 * The cached value of the '{@link #getStructConverters() <em>Struct Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlStructConverter> structConverters;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The cached value of the '{@link #getCopyPolicy() <em>Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCopyPolicy copyPolicy;
-
-	/**
-	 * The cached value of the '{@link #getInstantiationCopyPolicy() <em>Instantiation Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInstantiationCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlInstantiationCopyPolicy instantiationCopyPolicy;
-
-	/**
-	 * The cached value of the '{@link #getCloneCopyPolicy() <em>Clone Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCloneCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCloneCopyPolicy cloneCopyPolicy;
-
-	/**
-	 * The default value of the '{@link #getExcludeDefaultMappings() <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExcludeDefaultMappings() <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean excludeDefaultMappings = EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEmbeddable()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_EMBEDDABLE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAttributeOverrideContainer_AttributeOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAttributeOverride> getAttributeOverrides()
-	{
-		if (attributeOverrides == null)
-		{
-			attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES);
-		}
-		return attributeOverrides;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Association Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAssociationOverrideContainer_AssociationOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAssociationOverride> getAssociationOverrides()
-	{
-		if (associationOverrides == null)
-		{
-			associationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__ASSOCIATION_OVERRIDES);
-		}
-		return associationOverrides;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent 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>Parent Class</em>' attribute.
-	 * @see #setParentClass(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_2_2_ParentClass()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getParentClass()
-	{
-		return parentClass;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getParentClass <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Class</em>' attribute.
-	 * @see #getParentClass()
-	 * @generated
-	 */
-	public void setParentClass(String newParentClass)
-	{
-		String oldParentClass = parentClass;
-		parentClass = newParentClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__PARENT_CLASS, oldParentClass, parentClass));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Records</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>Plsql Records</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_2_3_PlsqlRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPlsqlRecord_2_3> getPlsqlRecords()
-	{
-		if (plsqlRecords == null)
-		{
-			plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS);
-		}
-		return plsqlRecords;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Tables</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>Plsql Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_2_3_PlsqlTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPlsqlTable> getPlsqlTables()
-	{
-		if (plsqlTables == null)
-		{
-			plsqlTables = new EObjectContainmentEList<XmlPlsqlTable>(XmlPlsqlTable.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES);
-		}
-		return plsqlTables;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct</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>Struct</em>' containment reference.
-	 * @see #setStruct(XmlStruct_2_3)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_2_3_Struct()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlStruct_2_3 getStruct()
-	{
-		return struct;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStruct(XmlStruct_2_3 newStruct, NotificationChain msgs)
-	{
-		XmlStruct_2_3 oldStruct = struct;
-		struct = newStruct;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT, oldStruct, newStruct);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getStruct <em>Struct</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct</em>' containment reference.
-	 * @see #getStruct()
-	 * @generated
-	 */
-	public void setStruct(XmlStruct_2_3 newStruct)
-	{
-		if (newStruct != struct)
-		{
-			NotificationChain msgs = null;
-			if (struct != null)
-				msgs = ((InternalEObject)struct).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT, null, msgs);
-			if (newStruct != null)
-				msgs = ((InternalEObject)newStruct).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT, null, msgs);
-			msgs = basicSetStruct(newStruct, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT, newStruct, newStruct));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Customizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Customizer</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>Customizer</em>' containment reference.
-	 * @see #setCustomizer(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder_Customizer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlClassReference getCustomizer()
-	{
-		return customizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCustomizer(XmlClassReference newCustomizer, NotificationChain msgs)
-	{
-		XmlClassReference oldCustomizer = customizer;
-		customizer = newCustomizer;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER, oldCustomizer, newCustomizer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCustomizer <em>Customizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Customizer</em>' containment reference.
-	 * @see #getCustomizer()
-	 * @generated
-	 */
-	public void setCustomizer(XmlClassReference newCustomizer)
-	{
-		if (newCustomizer != customizer)
-		{
-			NotificationChain msgs = null;
-			if (customizer != null)
-				msgs = ((InternalEObject)customizer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER, null, msgs);
-			if (newCustomizer != null)
-				msgs = ((InternalEObject)newCustomizer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER, null, msgs);
-			msgs = basicSetCustomizer(newCustomizer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER, newCustomizer, newCustomizer));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Change Tracking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Change Tracking</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>Change Tracking</em>' containment reference.
-	 * @see #setChangeTracking(XmlChangeTracking)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder_ChangeTracking()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlChangeTracking getChangeTracking()
-	{
-		return changeTracking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetChangeTracking(XmlChangeTracking newChangeTracking, NotificationChain msgs)
-	{
-		XmlChangeTracking oldChangeTracking = changeTracking;
-		changeTracking = newChangeTracking;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING, oldChangeTracking, newChangeTracking);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getChangeTracking <em>Change Tracking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Tracking</em>' containment reference.
-	 * @see #getChangeTracking()
-	 * @generated
-	 */
-	public void setChangeTracking(XmlChangeTracking newChangeTracking)
-	{
-		if (newChangeTracking != changeTracking)
-		{
-			NotificationChain msgs = null;
-			if (changeTracking != null)
-				msgs = ((InternalEObject)changeTracking).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING, null, msgs);
-			if (newChangeTracking != null)
-				msgs = ((InternalEObject)newChangeTracking).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING, null, msgs);
-			msgs = basicSetChangeTracking(newChangeTracking, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING, newChangeTracking, newChangeTracking));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converters</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>Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_Converters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlConverter> getConverters()
-	{
-		if (converters == null)
-		{
-			converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS);
-		}
-		return converters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converters</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>Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_TypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTypeConverter> getTypeConverters()
-	{
-		if (typeConverters == null)
-		{
-			typeConverters = new EObjectContainmentEList<XmlTypeConverter>(XmlTypeConverter.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS);
-		}
-		return typeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converters</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>Object Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_ObjectTypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlObjectTypeConverter> getObjectTypeConverters()
-	{
-		if (objectTypeConverters == null)
-		{
-			objectTypeConverters = new EObjectContainmentEList<XmlObjectTypeConverter>(XmlObjectTypeConverter.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS);
-		}
-		return objectTypeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converters</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>Struct Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_StructConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlStructConverter> getStructConverters()
-	{
-		if (structConverters == null)
-		{
-			structConverters = new EObjectContainmentEList<XmlStructConverter>(XmlStructConverter.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT_CONVERTERS);
-		}
-		return structConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Copy 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>Copy Policy</em>' containment reference.
-	 * @see #setCopyPolicy(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_CopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getCopyPolicy()
-	{
-		return copyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCopyPolicy(XmlCopyPolicy newCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy oldCopyPolicy = copyPolicy;
-		copyPolicy = newCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY, oldCopyPolicy, newCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCopyPolicy <em>Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Copy Policy</em>' containment reference.
-	 * @see #getCopyPolicy()
-	 * @generated
-	 */
-	public void setCopyPolicy(XmlCopyPolicy newCopyPolicy)
-	{
-		if (newCopyPolicy != copyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (copyPolicy != null)
-				msgs = ((InternalEObject)copyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY, null, msgs);
-			if (newCopyPolicy != null)
-				msgs = ((InternalEObject)newCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY, null, msgs);
-			msgs = basicSetCopyPolicy(newCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY, newCopyPolicy, newCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Instantiation Copy 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>Instantiation Copy Policy</em>' containment reference.
-	 * @see #setInstantiationCopyPolicy(XmlInstantiationCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_InstantiationCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlInstantiationCopyPolicy getInstantiationCopyPolicy()
-	{
-		return instantiationCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInstantiationCopyPolicy(XmlInstantiationCopyPolicy newInstantiationCopyPolicy, NotificationChain msgs)
-	{
-		XmlInstantiationCopyPolicy oldInstantiationCopyPolicy = instantiationCopyPolicy;
-		instantiationCopyPolicy = newInstantiationCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY, oldInstantiationCopyPolicy, newInstantiationCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Instantiation Copy Policy</em>' containment reference.
-	 * @see #getInstantiationCopyPolicy()
-	 * @generated
-	 */
-	public void setInstantiationCopyPolicy(XmlInstantiationCopyPolicy newInstantiationCopyPolicy)
-	{
-		if (newInstantiationCopyPolicy != instantiationCopyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (instantiationCopyPolicy != null)
-				msgs = ((InternalEObject)instantiationCopyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY, null, msgs);
-			if (newInstantiationCopyPolicy != null)
-				msgs = ((InternalEObject)newInstantiationCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY, null, msgs);
-			msgs = basicSetInstantiationCopyPolicy(newInstantiationCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY, newInstantiationCopyPolicy, newInstantiationCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Clone Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Clone Copy 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>Clone Copy Policy</em>' containment reference.
-	 * @see #setCloneCopyPolicy(XmlCloneCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_CloneCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCloneCopyPolicy getCloneCopyPolicy()
-	{
-		return cloneCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCloneCopyPolicy(XmlCloneCopyPolicy newCloneCopyPolicy, NotificationChain msgs)
-	{
-		XmlCloneCopyPolicy oldCloneCopyPolicy = cloneCopyPolicy;
-		cloneCopyPolicy = newCloneCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY, oldCloneCopyPolicy, newCloneCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getCloneCopyPolicy <em>Clone Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Clone Copy Policy</em>' containment reference.
-	 * @see #getCloneCopyPolicy()
-	 * @generated
-	 */
-	public void setCloneCopyPolicy(XmlCloneCopyPolicy newCloneCopyPolicy)
-	{
-		if (newCloneCopyPolicy != cloneCopyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (cloneCopyPolicy != null)
-				msgs = ((InternalEObject)cloneCopyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY, null, msgs);
-			if (newCloneCopyPolicy != null)
-				msgs = ((InternalEObject)newCloneCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY, null, msgs);
-			msgs = basicSetCloneCopyPolicy(newCloneCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY, newCloneCopyPolicy, newCloneCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Default Mappings</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exclude Default Mappings</em>' attribute.
-	 * @see #setExcludeDefaultMappings(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddable_ExcludeDefaultMappings()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getExcludeDefaultMappings()
-	{
-		return excludeDefaultMappings;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddable#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Default Mappings</em>' attribute.
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 */
-	public void setExcludeDefaultMappings(Boolean newExcludeDefaultMappings)
-	{
-		Boolean oldExcludeDefaultMappings = excludeDefaultMappings;
-		excludeDefaultMappings = newExcludeDefaultMappings;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS, oldExcludeDefaultMappings, excludeDefaultMappings));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES:
-				return ((InternalEList<?>)getAttributeOverrides()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ASSOCIATION_OVERRIDES:
-				return ((InternalEList<?>)getAssociationOverrides()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS:
-				return ((InternalEList<?>)getPlsqlRecords()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES:
-				return ((InternalEList<?>)getPlsqlTables()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT:
-				return basicSetStruct(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER:
-				return basicSetCustomizer(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING:
-				return basicSetChangeTracking(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS:
-				return ((InternalEList<?>)getConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS:
-				return ((InternalEList<?>)getTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS:
-				return ((InternalEList<?>)getObjectTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT_CONVERTERS:
-				return ((InternalEList<?>)getStructConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY:
-				return basicSetCopyPolicy(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY:
-				return basicSetInstantiationCopyPolicy(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY:
-				return basicSetCloneCopyPolicy(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 EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES:
-				return getAttributeOverrides();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ASSOCIATION_OVERRIDES:
-				return getAssociationOverrides();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PARENT_CLASS:
-				return getParentClass();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS:
-				return getPlsqlRecords();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES:
-				return getPlsqlTables();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT:
-				return getStruct();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER:
-				return getCustomizer();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING:
-				return getChangeTracking();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS:
-				return getConverters();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS:
-				return getTypeConverters();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS:
-				return getObjectTypeConverters();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT_CONVERTERS:
-				return getStructConverters();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY:
-				return getCopyPolicy();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY:
-				return getInstantiationCopyPolicy();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY:
-				return getCloneCopyPolicy();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS:
-				return getExcludeDefaultMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ASSOCIATION_OVERRIDES:
-				getAssociationOverrides().clear();
-				getAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PARENT_CLASS:
-				setParentClass((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS:
-				getPlsqlRecords().clear();
-				getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES:
-				getPlsqlTables().clear();
-				getPlsqlTables().addAll((Collection<? extends XmlPlsqlTable>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT:
-				setStruct((XmlStruct_2_3)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER:
-				setCustomizer((XmlClassReference)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING:
-				setChangeTracking((XmlChangeTracking)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS:
-				getConverters().clear();
-				getConverters().addAll((Collection<? extends XmlConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				getTypeConverters().addAll((Collection<? extends XmlTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				getObjectTypeConverters().addAll((Collection<? extends XmlObjectTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				getStructConverters().addAll((Collection<? extends XmlStructConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlInstantiationCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCloneCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS:
-				setExcludeDefaultMappings((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ASSOCIATION_OVERRIDES:
-				getAssociationOverrides().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PARENT_CLASS:
-				setParentClass(PARENT_CLASS_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS:
-				getPlsqlRecords().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES:
-				getPlsqlTables().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT:
-				setStruct((XmlStruct_2_3)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER:
-				setCustomizer((XmlClassReference)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING:
-				setChangeTracking((XmlChangeTracking)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS:
-				getConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlInstantiationCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCloneCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS:
-				setExcludeDefaultMappings(EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES:
-				return attributeOverrides != null && !attributeOverrides.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__ASSOCIATION_OVERRIDES:
-				return associationOverrides != null && !associationOverrides.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PARENT_CLASS:
-				return PARENT_CLASS_EDEFAULT == null ? parentClass != null : !PARENT_CLASS_EDEFAULT.equals(parentClass);
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS:
-				return plsqlRecords != null && !plsqlRecords.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES:
-				return plsqlTables != null && !plsqlTables.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT:
-				return struct != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER:
-				return customizer != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING:
-				return changeTracking != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS:
-				return converters != null && !converters.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS:
-				return typeConverters != null && !typeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS:
-				return objectTypeConverters != null && !objectTypeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT_CONVERTERS:
-				return structConverters != null && !structConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__COPY_POLICY:
-				return copyPolicy != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__INSTANTIATION_COPY_POLICY:
-				return instantiationCopyPolicy != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__CLONE_COPY_POLICY:
-				return cloneCopyPolicy != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDABLE__EXCLUDE_DEFAULT_MAPPINGS:
-				return EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT == null ? excludeDefaultMappings != null : !EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT.equals(excludeDefaultMappings);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddable_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeOverrideContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES: return OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER__ATTRIBUTE_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAssociationOverrideContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__ASSOCIATION_OVERRIDES: return OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER__ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddable_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__PARENT_CLASS: return EclipseLinkOrmV2_2Package.XML_EMBEDDABLE_22__PARENT_CLASS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddable_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS: return EclipseLinkOrmV2_3Package.XML_EMBEDDABLE_23__PLSQL_RECORDS;
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES: return EclipseLinkOrmV2_3Package.XML_EMBEDDABLE_23__PLSQL_TABLES;
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT: return EclipseLinkOrmV2_3Package.XML_EMBEDDABLE_23__STRUCT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCustomizerHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER: return EclipseLinkOrmPackage.XML_CUSTOMIZER_HOLDER__CUSTOMIZER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlChangeTrackingHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING: return EclipseLinkOrmPackage.XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDABLE__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_EMBEDDABLE__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddable_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeOverrideContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER__ATTRIBUTE_OVERRIDES: return EclipseLinkOrmPackage.XML_EMBEDDABLE__ATTRIBUTE_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAssociationOverrideContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER__ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_EMBEDDABLE__ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddable_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_EMBEDDABLE_22__PARENT_CLASS: return EclipseLinkOrmPackage.XML_EMBEDDABLE__PARENT_CLASS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEmbeddable_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_3Package.XML_EMBEDDABLE_23__PLSQL_RECORDS: return EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_RECORDS;
-				case EclipseLinkOrmV2_3Package.XML_EMBEDDABLE_23__PLSQL_TABLES: return EclipseLinkOrmPackage.XML_EMBEDDABLE__PLSQL_TABLES;
-				case EclipseLinkOrmV2_3Package.XML_EMBEDDABLE_23__STRUCT: return EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCustomizerHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CUSTOMIZER_HOLDER__CUSTOMIZER: return EclipseLinkOrmPackage.XML_EMBEDDABLE__CUSTOMIZER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlChangeTrackingHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING: return EclipseLinkOrmPackage.XML_EMBEDDABLE__CHANGE_TRACKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS: return EclipseLinkOrmPackage.XML_EMBEDDABLE__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_EMBEDDABLE__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_EMBEDDABLE__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_EMBEDDABLE__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_EMBEDDABLE__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(" (parentClass: ");
-		result.append(parentClass);
-		result.append(", excludeDefaultMappings: ");
-		result.append(excludeDefaultMappings);
-		result.append(')');
-		return result.toString();
-	}
-		
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlEmbeddable(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildClassTranslator(),
-			buildParentClassTranslator(),
-			buildAccessTranslator(),
-			buildMetadataCompleteTranslator(),
-			buildExcludeDefaultMappingsTranslator(),
-			buildDescriptionTranslator(),
-			buildAccessMethodsTranslator(),
-			buildCustomizerTranslator(),
-			buildChangeTrackingTranslator(),
-			XmlStruct.buildTranslator(EclipseLink2_3.STRUCT, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEmbeddable_2_3_Struct()),
-			buildConverterTranslator(),
-			buildTypeConverterTranslator(),
-			buildObjectTypeConverterTranslator(),
-			buildStructConverterTranslator(),
-			buildCopyPolicyTranslator(),
-			buildInstantiationCoypPolicyTranslator(),
-			buildCloneCopyPolicyTranslator(),
-			XmlPlsqlRecord.buildTranslator(EclipseLink2_3.PLSQL_RECORD, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEmbeddable_2_3_PlsqlRecords()),
-			XmlPlsqlTable.buildTranslator(EclipseLink2_3.PLSQL_TABLE, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEmbeddable_2_3_PlsqlTables()),
-			buildPropertyTranslator(),
-			buildAttributeOverrideTranslator(),
-			buildAssociationOverrideTranslator(),
-			Attributes.buildTranslator()};
-	}
-	
-	protected static Translator buildExcludeDefaultMappingsTranslator() {
-		return new Translator(EclipseLink.EXCLUDE_DEFAULT_MAPPINGS, EclipseLinkOrmPackage.eINSTANCE.getXmlEmbeddable_ExcludeDefaultMappings(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildCustomizerTranslator() {
-		return XmlClassReference.buildTranslator(EclipseLink.CUSTOMIZER, EclipseLinkOrmPackage.eINSTANCE.getXmlCustomizerHolder_Customizer());
-	}
-	
-	protected static Translator buildChangeTrackingTranslator() {
-		return XmlChangeTracking.buildTranslator(EclipseLink.CHANGE_TRACKING, EclipseLinkOrmPackage.eINSTANCE.getXmlChangeTrackingHolder_ChangeTracking());
-	}
-	
-	protected static Translator buildConverterTranslator() {
-		return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_Converters());
-	}
-	
-	protected static Translator buildTypeConverterTranslator() {
-		return XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_TypeConverters());
-	}
-	
-	protected static Translator buildObjectTypeConverterTranslator() {
-		return XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_ObjectTypeConverters());
-	}
-	
-	protected static Translator buildStructConverterTranslator() {
-		return XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_StructConverters());
-	}
-	
-	protected static Translator buildCopyPolicyTranslator() {
-		return XmlCopyPolicy.buildTranslator(EclipseLink.COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlEmbeddable_CopyPolicy());
-	}
-	
-	protected static Translator buildInstantiationCoypPolicyTranslator() {
-		return XmlInstantiationCopyPolicy.buildTranslator(EclipseLink.INSTANTIATION_COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlEmbeddable_InstantiationCopyPolicy());
-	}
-	
-	protected static Translator buildCloneCopyPolicyTranslator() {
-		return XmlCloneCopyPolicy.buildTranslator(EclipseLink.CLONE_COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlEmbeddable_CloneCopyPolicy());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildParentClassTranslator() {
-		return new Translator(EclipseLink2_2.PARENT_CLASS, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEmbeddable_2_2_ParentClass(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildAttributeOverrideTranslator() {
-		return XmlAttributeOverride.buildTranslator(JPA.ATTRIBUTE_OVERRIDE, OrmPackage.eINSTANCE.getXmlAttributeOverrideContainer_AttributeOverrides());
-	}
-	
-	protected static Translator buildAssociationOverrideTranslator() {
-		return XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, OrmPackage.eINSTANCE.getXmlAssociationOverrideContainer_AssociationOverrides());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.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
deleted file mode 100644
index 45ee1b7166..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbedded.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.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.XmlEmbedded_2_1;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Impl</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbedded extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedded implements XmlEmbedded_2_1, XmlAttributeMapping
-{
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEmbedded()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_EMBEDDED;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbedded_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbedded#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES:
-				return getProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES:
-				getProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlEmbedded_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_EMBEDDED_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				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 == XmlEmbedded_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_EMBEDDED_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_EMBEDDED__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_EMBEDDED__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_EMBEDDED__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				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(" (attributeType: ");
-		result.append(attributeType);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlEmbedded(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator(),
-			buildAttributeTypeTranslator(),
-			buildAttributeOverrideTranslator(),
-			buildAssociationOverrideTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator()
-		};
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlEmbedded_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddedId.java
deleted file mode 100644
index 6ff6d0100c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEmbeddedId.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.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.XmlEmbeddedId_2_1;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Id Impl</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId()
- * @model kind="class"
- * @generated
- */
-public class XmlEmbeddedId extends org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddedId implements XmlEmbeddedId_2_1, XmlAttributeMapping
-{
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEmbeddedId()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_EMBEDDED_ID;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEmbeddedId_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEmbeddedId#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES:
-				return getProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES:
-				getProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlEmbeddedId_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				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 == XmlEmbeddedId_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_EMBEDDED_ID__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_EMBEDDED_ID__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_EMBEDDED_ID__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				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(" (attributeType: ");
-		result.append(attributeType);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlEmbeddedId(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator(),
-			buildAttributeTypeTranslator(),
-			buildAttributeOverrideTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator()
-		};
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlEmbeddedId_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-
-}
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
deleted file mode 100644
index 2f558050a6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntity.java
+++ /dev/null
@@ -1,3750 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2008, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.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;
-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;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-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.XmlEntity_1_1;
-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.XmlEntity_2_0;
-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.XmlEntity_2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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.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.XmlMultitenant_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Entity</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getOptimisticLocking <em>Optimistic Locking</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCopyPolicy <em>Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCloneCopyPolicy <em>Clone Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity()
- * @model kind="class"
- * @generated
- */
-public class XmlEntity extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntity implements XmlEntity_1_1, XmlEntity_2_0, XmlEntity_2_1, XmlEntity_2_2, XmlEntity_2_3, XmlEntity_2_4, XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder, XmlQueryContainer, XmlPropertyContainer
-{
-	/**
-	 * The cached value of the '{@link #getPrimaryKey() <em>Primary Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimaryKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPrimaryKey primaryKey;
-
-	/**
-	 * The cached value of the '{@link #getCacheInterceptor() <em>Cache Interceptor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheInterceptor()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlClassReference cacheInterceptor;
-
-	/**
-	 * The cached value of the '{@link #getQueryRedirectors() <em>Query Redirectors</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueryRedirectors()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlQueryRedirectors queryRedirectors;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getFetchGroups() <em>Fetch Groups</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFetchGroups()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlFetchGroup> fetchGroups;
-
-	/**
-	 * The cached value of the '{@link #getClassExtractor() <em>Class Extractor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassExtractor()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlClassReference classExtractor;
-
-	/**
-	 * The default value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARENT_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String parentClass = PARENT_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPartitioning_2_2 partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReplicationPartitioning_2_2 replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRangePartitioning_2_2 rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlValuePartitioning_2_2 valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlHashPartitioning_2_2 hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlUnionPartitioning_2_2 unionPartitioning;
-
-	/**
-	 * The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARTITIONED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected String partitioned = PARTITIONED_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAdditionalCriteria() <em>Additional Criteria</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdditionalCriteria()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAdditionalCriteria_2_2 additionalCriteria;
-
-	/**
-	 * The default value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CASCADE_ON_DELETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cascadeOnDelete = CASCADE_ON_DELETE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getIndex() <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlIndex_2_2 index;
-
-	/**
-	 * The cached value of the '{@link #getMultitenant() <em>Multitenant</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMultitenant()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlMultitenant_2_3 multitenant;
-
-	/**
-	 * The cached value of the '{@link #getNamedStoredFunctionQueries() <em>Named Stored Function Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedStoredFunctionQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedStoredFunctionQuery_2_3> namedStoredFunctionQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedPlsqlStoredFunctionQueries() <em>Named Plsql Stored Function Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedPlsqlStoredFunctionQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedPlsqlStoredFunctionQuery_2_3> namedPlsqlStoredFunctionQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedPlsqlStoredProcedureQueries() <em>Named Plsql Stored Procedure Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedPlsqlStoredProcedureQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedPlsqlStoredProcedureQuery_2_3> namedPlsqlStoredProcedureQueries;
-
-	/**
-	 * The cached value of the '{@link #getPlsqlRecords() <em>Plsql Records</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlsqlRecords()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPlsqlRecord_2_3> plsqlRecords;
-
-	/**
-	 * The cached value of the '{@link #getPlsqlTables() <em>Plsql Tables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlsqlTables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPlsqlTable> plsqlTables;
-
-	/**
-	 * The cached value of the '{@link #getStruct() <em>Struct</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStruct()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlStruct_2_3 struct;
-
-	/**
-	 * The cached value of the '{@link #getCacheIndex() <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCacheIndex_2_4 cacheIndex;
-
-	/**
-	 * The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean READ_ONLY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean readOnly = READ_ONLY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCustomizer() <em>Customizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizer()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlClassReference customizer;
-
-	/**
-	 * The cached value of the '{@link #getChangeTracking() <em>Change Tracking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeTracking()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlChangeTracking changeTracking;
-
-	/**
-	 * The cached value of the '{@link #getCache() <em>Cache</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCache()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCache cache;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final ExistenceType EXISTENCE_CHECKING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExistenceChecking() <em>Existence Checking</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExistenceChecking()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExistenceType existenceChecking = EXISTENCE_CHECKING_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConverters() <em>Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlConverter> converters;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTypeConverter> typeConverters;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverters() <em>Object Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlObjectTypeConverter> objectTypeConverters;
-
-	/**
-	 * The cached value of the '{@link #getStructConverters() <em>Struct Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlStructConverter> structConverters;
-
-	/**
-	 * The cached value of the '{@link #getNamedStoredProcedureQueries() <em>Named Stored Procedure Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedStoredProcedureQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedStoredProcedureQuery> namedStoredProcedureQueries;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The cached value of the '{@link #getOptimisticLocking() <em>Optimistic Locking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptimisticLocking()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlOptimisticLocking optimisticLocking;
-
-	/**
-	 * The cached value of the '{@link #getCopyPolicy() <em>Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCopyPolicy copyPolicy;
-
-	/**
-	 * The cached value of the '{@link #getInstantiationCopyPolicy() <em>Instantiation Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInstantiationCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlInstantiationCopyPolicy instantiationCopyPolicy;
-
-	/**
-	 * The cached value of the '{@link #getCloneCopyPolicy() <em>Clone Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCloneCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCloneCopyPolicy cloneCopyPolicy;
-
-	/**
-	 * The default value of the '{@link #getExcludeDefaultMappings() <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExcludeDefaultMappings() <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean excludeDefaultMappings = EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEntity()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ENTITY;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly_ReadOnly()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getReadOnly()
-	{
-		return readOnly;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getReadOnly <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Only</em>' attribute.
-	 * @see #getReadOnly()
-	 * @generated
-	 */
-	public void setReadOnly(Boolean newReadOnly)
-	{
-		Boolean oldReadOnly = readOnly;
-		readOnly = newReadOnly;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY, oldReadOnly, readOnly));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Customizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Customizer</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>Customizer</em>' containment reference.
-	 * @see #setCustomizer(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder_Customizer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlClassReference getCustomizer()
-	{
-		return customizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCustomizer(XmlClassReference newCustomizer, NotificationChain msgs)
-	{
-		XmlClassReference oldCustomizer = customizer;
-		customizer = newCustomizer;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER, oldCustomizer, newCustomizer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCustomizer <em>Customizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Customizer</em>' containment reference.
-	 * @see #getCustomizer()
-	 * @generated
-	 */
-	public void setCustomizer(XmlClassReference newCustomizer)
-	{
-		if (newCustomizer != customizer)
-		{
-			NotificationChain msgs = null;
-			if (customizer != null)
-				msgs = ((InternalEObject)customizer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER, null, msgs);
-			if (newCustomizer != null)
-				msgs = ((InternalEObject)newCustomizer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER, null, msgs);
-			msgs = basicSetCustomizer(newCustomizer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER, newCustomizer, newCustomizer));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Change Tracking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Change Tracking</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>Change Tracking</em>' containment reference.
-	 * @see #setChangeTracking(XmlChangeTracking)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder_ChangeTracking()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlChangeTracking getChangeTracking()
-	{
-		return changeTracking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetChangeTracking(XmlChangeTracking newChangeTracking, NotificationChain msgs)
-	{
-		XmlChangeTracking oldChangeTracking = changeTracking;
-		changeTracking = newChangeTracking;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING, oldChangeTracking, newChangeTracking);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getChangeTracking <em>Change Tracking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Tracking</em>' containment reference.
-	 * @see #getChangeTracking()
-	 * @generated
-	 */
-	public void setChangeTracking(XmlChangeTracking newChangeTracking)
-	{
-		if (newChangeTracking != changeTracking)
-		{
-			NotificationChain msgs = null;
-			if (changeTracking != null)
-				msgs = ((InternalEObject)changeTracking).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING, null, msgs);
-			if (newChangeTracking != null)
-				msgs = ((InternalEObject)newChangeTracking).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING, null, msgs);
-			msgs = basicSetChangeTracking(newChangeTracking, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING, newChangeTracking, newChangeTracking));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache</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>Cache</em>' containment reference.
-	 * @see #setCache(XmlCache)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_Cache()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCache getCache()
-	{
-		return cache;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCache(XmlCache newCache, NotificationChain msgs)
-	{
-		XmlCache oldCache = cache;
-		cache = newCache;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CACHE, oldCache, newCache);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCache <em>Cache</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache</em>' containment reference.
-	 * @see #getCache()
-	 * @generated
-	 */
-	public void setCache(XmlCache newCache)
-	{
-		if (newCache != cache)
-		{
-			NotificationChain msgs = null;
-			if (cache != null)
-				msgs = ((InternalEObject)cache).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CACHE, null, msgs);
-			if (newCache != null)
-				msgs = ((InternalEObject)newCache).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CACHE, null, msgs);
-			msgs = basicSetCache(newCache, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CACHE, newCache, newCache));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Existence Checking</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Existence Checking</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Existence Checking</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-	 * @see #setExistenceChecking(ExistenceType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_ExistenceChecking()
-	 * @model default=""
-	 * @generated
-	 */
-	public ExistenceType getExistenceChecking()
-	{
-		return existenceChecking;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getExistenceChecking <em>Existence Checking</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Existence Checking</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-	 * @see #getExistenceChecking()
-	 * @generated
-	 */
-	public void setExistenceChecking(ExistenceType newExistenceChecking)
-	{
-		ExistenceType oldExistenceChecking = existenceChecking;
-		existenceChecking = newExistenceChecking == null ? EXISTENCE_CHECKING_EDEFAULT : newExistenceChecking;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__EXISTENCE_CHECKING, oldExistenceChecking, existenceChecking));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converters</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>Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_Converters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlConverter> getConverters()
-	{
-		if (converters == null)
-		{
-			converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS);
-		}
-		return converters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converters</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>Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_TypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTypeConverter> getTypeConverters()
-	{
-		if (typeConverters == null)
-		{
-			typeConverters = new EObjectContainmentEList<XmlTypeConverter>(XmlTypeConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS);
-		}
-		return typeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converters</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>Object Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_ObjectTypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlObjectTypeConverter> getObjectTypeConverters()
-	{
-		if (objectTypeConverters == null)
-		{
-			objectTypeConverters = new EObjectContainmentEList<XmlObjectTypeConverter>(XmlObjectTypeConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY__OBJECT_TYPE_CONVERTERS);
-		}
-		return objectTypeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converters</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>Struct Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_StructConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlStructConverter> getStructConverters()
-	{
-		if (structConverters == null)
-		{
-			structConverters = new EObjectContainmentEList<XmlStructConverter>(XmlStructConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY__STRUCT_CONVERTERS);
-		}
-		return structConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Optimistic Locking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optimistic Locking</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>Optimistic Locking</em>' containment reference.
-	 * @see #setOptimisticLocking(XmlOptimisticLocking)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_OptimisticLocking()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlOptimisticLocking getOptimisticLocking()
-	{
-		return optimisticLocking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOptimisticLocking(XmlOptimisticLocking newOptimisticLocking, NotificationChain msgs)
-	{
-		XmlOptimisticLocking oldOptimisticLocking = optimisticLocking;
-		optimisticLocking = newOptimisticLocking;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING, oldOptimisticLocking, newOptimisticLocking);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getOptimisticLocking <em>Optimistic Locking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optimistic Locking</em>' containment reference.
-	 * @see #getOptimisticLocking()
-	 * @generated
-	 */
-	public void setOptimisticLocking(XmlOptimisticLocking newOptimisticLocking)
-	{
-		if (newOptimisticLocking != optimisticLocking)
-		{
-			NotificationChain msgs = null;
-			if (optimisticLocking != null)
-				msgs = ((InternalEObject)optimisticLocking).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING, null, msgs);
-			if (newOptimisticLocking != null)
-				msgs = ((InternalEObject)newOptimisticLocking).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING, null, msgs);
-			msgs = basicSetOptimisticLocking(newOptimisticLocking, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING, newOptimisticLocking, newOptimisticLocking));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Copy 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>Copy Policy</em>' containment reference.
-	 * @see #setCopyPolicy(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_CopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getCopyPolicy()
-	{
-		return copyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCopyPolicy(XmlCopyPolicy newCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy oldCopyPolicy = copyPolicy;
-		copyPolicy = newCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY, oldCopyPolicy, newCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCopyPolicy <em>Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Copy Policy</em>' containment reference.
-	 * @see #getCopyPolicy()
-	 * @generated
-	 */
-	public void setCopyPolicy(XmlCopyPolicy newCopyPolicy)
-	{
-		if (newCopyPolicy != copyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (copyPolicy != null)
-				msgs = ((InternalEObject)copyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY, null, msgs);
-			if (newCopyPolicy != null)
-				msgs = ((InternalEObject)newCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY, null, msgs);
-			msgs = basicSetCopyPolicy(newCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY, newCopyPolicy, newCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Instantiation Copy 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>Instantiation Copy Policy</em>' containment reference.
-	 * @see #setInstantiationCopyPolicy(XmlInstantiationCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_InstantiationCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlInstantiationCopyPolicy getInstantiationCopyPolicy()
-	{
-		return instantiationCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInstantiationCopyPolicy(XmlInstantiationCopyPolicy newInstantiationCopyPolicy, NotificationChain msgs)
-	{
-		XmlInstantiationCopyPolicy oldInstantiationCopyPolicy = instantiationCopyPolicy;
-		instantiationCopyPolicy = newInstantiationCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY, oldInstantiationCopyPolicy, newInstantiationCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Instantiation Copy Policy</em>' containment reference.
-	 * @see #getInstantiationCopyPolicy()
-	 * @generated
-	 */
-	public void setInstantiationCopyPolicy(XmlInstantiationCopyPolicy newInstantiationCopyPolicy)
-	{
-		if (newInstantiationCopyPolicy != instantiationCopyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (instantiationCopyPolicy != null)
-				msgs = ((InternalEObject)instantiationCopyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY, null, msgs);
-			if (newInstantiationCopyPolicy != null)
-				msgs = ((InternalEObject)newInstantiationCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY, null, msgs);
-			msgs = basicSetInstantiationCopyPolicy(newInstantiationCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY, newInstantiationCopyPolicy, newInstantiationCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Clone Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Clone Copy 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>Clone Copy Policy</em>' containment reference.
-	 * @see #setCloneCopyPolicy(XmlCloneCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_CloneCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCloneCopyPolicy getCloneCopyPolicy()
-	{
-		return cloneCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCloneCopyPolicy(XmlCloneCopyPolicy newCloneCopyPolicy, NotificationChain msgs)
-	{
-		XmlCloneCopyPolicy oldCloneCopyPolicy = cloneCopyPolicy;
-		cloneCopyPolicy = newCloneCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY, oldCloneCopyPolicy, newCloneCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCloneCopyPolicy <em>Clone Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Clone Copy Policy</em>' containment reference.
-	 * @see #getCloneCopyPolicy()
-	 * @generated
-	 */
-	public void setCloneCopyPolicy(XmlCloneCopyPolicy newCloneCopyPolicy)
-	{
-		if (newCloneCopyPolicy != cloneCopyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (cloneCopyPolicy != null)
-				msgs = ((InternalEObject)cloneCopyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY, null, msgs);
-			if (newCloneCopyPolicy != null)
-				msgs = ((InternalEObject)newCloneCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY, null, msgs);
-			msgs = basicSetCloneCopyPolicy(newCloneCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY, newCloneCopyPolicy, newCloneCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries()
-	{
-		if (namedStoredProcedureQueries == null)
-		{
-			namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery>(XmlNamedStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES);
-		}
-		return namedStoredProcedureQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key</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>Primary Key</em>' containment reference.
-	 * @see #setPrimaryKey(XmlPrimaryKey)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_1_1_PrimaryKey()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPrimaryKey getPrimaryKey()
-	{
-		return primaryKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrimaryKey(XmlPrimaryKey newPrimaryKey, NotificationChain msgs)
-	{
-		XmlPrimaryKey oldPrimaryKey = primaryKey;
-		primaryKey = newPrimaryKey;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY, oldPrimaryKey, newPrimaryKey);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getPrimaryKey <em>Primary Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key</em>' containment reference.
-	 * @see #getPrimaryKey()
-	 * @generated
-	 */
-	public void setPrimaryKey(XmlPrimaryKey newPrimaryKey)
-	{
-		if (newPrimaryKey != primaryKey)
-		{
-			NotificationChain msgs = null;
-			if (primaryKey != null)
-				msgs = ((InternalEObject)primaryKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY, null, msgs);
-			if (newPrimaryKey != null)
-				msgs = ((InternalEObject)newPrimaryKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY, null, msgs);
-			msgs = basicSetPrimaryKey(newPrimaryKey, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY, newPrimaryKey, newPrimaryKey));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache Interceptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Interceptor</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>Cache Interceptor</em>' containment reference.
-	 * @see #setCacheInterceptor(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_0_CacheInterceptor()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlClassReference getCacheInterceptor()
-	{
-		return cacheInterceptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCacheInterceptor(XmlClassReference newCacheInterceptor, NotificationChain msgs)
-	{
-		XmlClassReference oldCacheInterceptor = cacheInterceptor;
-		cacheInterceptor = newCacheInterceptor;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR, oldCacheInterceptor, newCacheInterceptor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Interceptor</em>' containment reference.
-	 * @see #getCacheInterceptor()
-	 * @generated
-	 */
-	public void setCacheInterceptor(XmlClassReference newCacheInterceptor)
-	{
-		if (newCacheInterceptor != cacheInterceptor)
-		{
-			NotificationChain msgs = null;
-			if (cacheInterceptor != null)
-				msgs = ((InternalEObject)cacheInterceptor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR, null, msgs);
-			if (newCacheInterceptor != null)
-				msgs = ((InternalEObject)newCacheInterceptor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR, null, msgs);
-			msgs = basicSetCacheInterceptor(newCacheInterceptor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR, newCacheInterceptor, newCacheInterceptor));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query Redirectors</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query Redirectors</em>' containment reference.
-	 * @see #setQueryRedirectors(XmlQueryRedirectors)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_0_QueryRedirectors()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlQueryRedirectors getQueryRedirectors()
-	{
-		return queryRedirectors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetQueryRedirectors(XmlQueryRedirectors newQueryRedirectors, NotificationChain msgs)
-	{
-		XmlQueryRedirectors oldQueryRedirectors = queryRedirectors;
-		queryRedirectors = newQueryRedirectors;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS, oldQueryRedirectors, newQueryRedirectors);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getQueryRedirectors <em>Query Redirectors</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query Redirectors</em>' containment reference.
-	 * @see #getQueryRedirectors()
-	 * @generated
-	 */
-	public void setQueryRedirectors(XmlQueryRedirectors newQueryRedirectors)
-	{
-		if (newQueryRedirectors != queryRedirectors)
-		{
-			NotificationChain msgs = null;
-			if (queryRedirectors != null)
-				msgs = ((InternalEObject)queryRedirectors).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS, null, msgs);
-			if (newQueryRedirectors != null)
-				msgs = ((InternalEObject)newQueryRedirectors).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS, null, msgs);
-			msgs = basicSetQueryRedirectors(newQueryRedirectors, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS, newQueryRedirectors, newQueryRedirectors));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fetch Groups</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fetch Groups</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroupContainer_2_1_FetchGroups()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlFetchGroup> getFetchGroups()
-	{
-		if (fetchGroups == null)
-		{
-			fetchGroups = new EObjectContainmentEList<XmlFetchGroup>(XmlFetchGroup.class, this, EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS);
-		}
-		return fetchGroups;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Class Extractor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class Extractor</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class Extractor</em>' containment reference.
-	 * @see #setClassExtractor(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_1_ClassExtractor()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlClassReference getClassExtractor()
-	{
-		return classExtractor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetClassExtractor(XmlClassReference newClassExtractor, NotificationChain msgs)
-	{
-		XmlClassReference oldClassExtractor = classExtractor;
-		classExtractor = newClassExtractor;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR, oldClassExtractor, newClassExtractor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getClassExtractor <em>Class Extractor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Extractor</em>' containment reference.
-	 * @see #getClassExtractor()
-	 * @generated
-	 */
-	public void setClassExtractor(XmlClassReference newClassExtractor)
-	{
-		if (newClassExtractor != classExtractor)
-		{
-			NotificationChain msgs = null;
-			if (classExtractor != null)
-				msgs = ((InternalEObject)classExtractor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR, null, msgs);
-			if (newClassExtractor != null)
-				msgs = ((InternalEObject)newClassExtractor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR, null, msgs);
-			msgs = basicSetClassExtractor(newClassExtractor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR, newClassExtractor, newClassExtractor));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent 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>Parent Class</em>' attribute.
-	 * @see #setParentClass(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_1_ParentClass()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getParentClass()
-	{
-		return parentClass;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getParentClass <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Class</em>' attribute.
-	 * @see #getParentClass()
-	 * @generated
-	 */
-	public void setParentClass(String newParentClass)
-	{
-		String oldParentClass = parentClass;
-		parentClass = newParentClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS, oldParentClass, parentClass));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPartitioning_2_2 getPartitioning()
-	{
-		return partitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
-	{
-		XmlPartitioning_2_2 oldPartitioning = partitioning;
-		partitioning = newPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING, oldPartitioning, newPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
-	{
-		if (newPartitioning != partitioning)
-		{
-			NotificationChain msgs = null;
-			if (partitioning != null)
-				msgs = ((InternalEObject)partitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING, null, msgs);
-			if (newPartitioning != null)
-				msgs = ((InternalEObject)newPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING, null, msgs);
-			msgs = basicSetPartitioning(newPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING, newPartitioning, newPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
-	{
-		return replicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
-	{
-		XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
-		replicationPartitioning = newReplicationPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING, oldReplicationPartitioning, newReplicationPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
-	{
-		if (newReplicationPartitioning != replicationPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (replicationPartitioning != null)
-				msgs = ((InternalEObject)replicationPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING, null, msgs);
-			if (newReplicationPartitioning != null)
-				msgs = ((InternalEObject)newReplicationPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING, null, msgs);
-			msgs = basicSetReplicationPartitioning(newReplicationPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING, newReplicationPartitioning, newReplicationPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
-	{
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
-	{
-		XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
-		roundRobinPartitioning = newRoundRobinPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING, oldRoundRobinPartitioning, newRoundRobinPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
-	{
-		if (newRoundRobinPartitioning != roundRobinPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (roundRobinPartitioning != null)
-				msgs = ((InternalEObject)roundRobinPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING, null, msgs);
-			if (newRoundRobinPartitioning != null)
-				msgs = ((InternalEObject)newRoundRobinPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING, null, msgs);
-			msgs = basicSetRoundRobinPartitioning(newRoundRobinPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING, newRoundRobinPartitioning, newRoundRobinPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
-	{
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
-	{
-		XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
-		pinnedPartitioning = newPinnedPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING, oldPinnedPartitioning, newPinnedPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
-	{
-		if (newPinnedPartitioning != pinnedPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (pinnedPartitioning != null)
-				msgs = ((InternalEObject)pinnedPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING, null, msgs);
-			if (newPinnedPartitioning != null)
-				msgs = ((InternalEObject)newPinnedPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING, null, msgs);
-			msgs = basicSetPinnedPartitioning(newPinnedPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING, newPinnedPartitioning, newPinnedPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRangePartitioning_2_2 getRangePartitioning()
-	{
-		return rangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
-	{
-		XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
-		rangePartitioning = newRangePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING, oldRangePartitioning, newRangePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
-	{
-		if (newRangePartitioning != rangePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (rangePartitioning != null)
-				msgs = ((InternalEObject)rangePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING, null, msgs);
-			if (newRangePartitioning != null)
-				msgs = ((InternalEObject)newRangePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING, null, msgs);
-			msgs = basicSetRangePartitioning(newRangePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING, newRangePartitioning, newRangePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlValuePartitioning_2_2 getValuePartitioning()
-	{
-		return valuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
-	{
-		XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
-		valuePartitioning = newValuePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING, oldValuePartitioning, newValuePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
-	{
-		if (newValuePartitioning != valuePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (valuePartitioning != null)
-				msgs = ((InternalEObject)valuePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING, null, msgs);
-			if (newValuePartitioning != null)
-				msgs = ((InternalEObject)newValuePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING, null, msgs);
-			msgs = basicSetValuePartitioning(newValuePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING, newValuePartitioning, newValuePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlHashPartitioning_2_2 getHashPartitioning()
-	{
-		return hashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
-	{
-		XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
-		hashPartitioning = newHashPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING, oldHashPartitioning, newHashPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
-	{
-		if (newHashPartitioning != hashPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (hashPartitioning != null)
-				msgs = ((InternalEObject)hashPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING, null, msgs);
-			if (newHashPartitioning != null)
-				msgs = ((InternalEObject)newHashPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING, null, msgs);
-			msgs = basicSetHashPartitioning(newHashPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING, newHashPartitioning, newHashPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlUnionPartitioning_2_2 getUnionPartitioning()
-	{
-		return unionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
-	{
-		XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
-		unionPartitioning = newUnionPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING, oldUnionPartitioning, newUnionPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
-	{
-		if (newUnionPartitioning != unionPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (unionPartitioning != null)
-				msgs = ((InternalEObject)unionPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING, null, msgs);
-			if (newUnionPartitioning != null)
-				msgs = ((InternalEObject)newUnionPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING, null, msgs);
-			msgs = basicSetUnionPartitioning(newUnionPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING, newUnionPartitioning, newUnionPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPartitioned()
-	{
-		return partitioned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	public void setPartitioned(String newPartitioned)
-	{
-		String oldPartitioned = partitioned;
-		partitioned = newPartitioned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED, oldPartitioned, partitioned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCascadeOnDelete()
-	{
-		return cascadeOnDelete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	public void setCascadeOnDelete(Boolean newCascadeOnDelete)
-	{
-		Boolean oldCascadeOnDelete = cascadeOnDelete;
-		cascadeOnDelete = newCascadeOnDelete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE, oldCascadeOnDelete, cascadeOnDelete));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(XmlIndex_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_2_Index()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlIndex_2_2 getIndex()
-	{
-		return index;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIndex(XmlIndex_2_2 newIndex, NotificationChain msgs)
-	{
-		XmlIndex_2_2 oldIndex = index;
-		index = newIndex;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__INDEX, oldIndex, newIndex);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	public void setIndex(XmlIndex_2_2 newIndex)
-	{
-		if (newIndex != index)
-		{
-			NotificationChain msgs = null;
-			if (index != null)
-				msgs = ((InternalEObject)index).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__INDEX, null, msgs);
-			if (newIndex != null)
-				msgs = ((InternalEObject)newIndex).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__INDEX, null, msgs);
-			msgs = basicSetIndex(newIndex, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__INDEX, newIndex, newIndex));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Multitenant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multitenant</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>Multitenant</em>' containment reference.
-	 * @see #setMultitenant(XmlMultitenant_2_3)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_3_Multitenant()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlMultitenant_2_3 getMultitenant()
-	{
-		return multitenant;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMultitenant(XmlMultitenant_2_3 newMultitenant, NotificationChain msgs)
-	{
-		XmlMultitenant_2_3 oldMultitenant = multitenant;
-		multitenant = newMultitenant;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT, oldMultitenant, newMultitenant);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getMultitenant <em>Multitenant</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multitenant</em>' containment reference.
-	 * @see #getMultitenant()
-	 * @generated
-	 */
-	public void setMultitenant(XmlMultitenant_2_3 newMultitenant)
-	{
-		if (newMultitenant != multitenant)
-		{
-			NotificationChain msgs = null;
-			if (multitenant != null)
-				msgs = ((InternalEObject)multitenant).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT, null, msgs);
-			if (newMultitenant != null)
-				msgs = ((InternalEObject)newMultitenant).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT, null, msgs);
-			msgs = basicSetMultitenant(newMultitenant, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT, newMultitenant, newMultitenant));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_3_NamedStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries()
-	{
-		if (namedStoredFunctionQueries == null)
-		{
-			namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery_2_3>(XmlNamedStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES);
-		}
-		return namedStoredFunctionQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_3_NamedPlsqlStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries()
-	{
-		if (namedPlsqlStoredFunctionQueries == null)
-		{
-			namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery_2_3>(XmlNamedPlsqlStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
-		}
-		return namedPlsqlStoredFunctionQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_3_NamedPlsqlStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries()
-	{
-		if (namedPlsqlStoredProcedureQueries == null)
-		{
-			namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery_2_3>(XmlNamedPlsqlStoredProcedureQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
-		}
-		return namedPlsqlStoredProcedureQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Records</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>Plsql Records</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_3_PlsqlRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPlsqlRecord_2_3> getPlsqlRecords()
-	{
-		if (plsqlRecords == null)
-		{
-			plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS);
-		}
-		return plsqlRecords;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Tables</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>Plsql Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_3_PlsqlTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPlsqlTable> getPlsqlTables()
-	{
-		if (plsqlTables == null)
-		{
-			plsqlTables = new EObjectContainmentEList<XmlPlsqlTable>(XmlPlsqlTable.class, this, EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES);
-		}
-		return plsqlTables;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct</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>Struct</em>' containment reference.
-	 * @see #setStruct(XmlStruct_2_3)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_3_Struct()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlStruct_2_3 getStruct()
-	{
-		return struct;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStruct(XmlStruct_2_3 newStruct, NotificationChain msgs)
-	{
-		XmlStruct_2_3 oldStruct = struct;
-		struct = newStruct;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__STRUCT, oldStruct, newStruct);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getStruct <em>Struct</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct</em>' containment reference.
-	 * @see #getStruct()
-	 * @generated
-	 */
-	public void setStruct(XmlStruct_2_3 newStruct)
-	{
-		if (newStruct != struct)
-		{
-			NotificationChain msgs = null;
-			if (struct != null)
-				msgs = ((InternalEObject)struct).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__STRUCT, null, msgs);
-			if (newStruct != null)
-				msgs = ((InternalEObject)newStruct).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__STRUCT, null, msgs);
-			msgs = basicSetStruct(newStruct, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__STRUCT, newStruct, newStruct));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Index</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>Cache Index</em>' containment reference.
-	 * @see #setCacheIndex(XmlCacheIndex_2_4)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_4_CacheIndex()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCacheIndex_2_4 getCacheIndex()
-	{
-		return cacheIndex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCacheIndex(XmlCacheIndex_2_4 newCacheIndex, NotificationChain msgs)
-	{
-		XmlCacheIndex_2_4 oldCacheIndex = cacheIndex;
-		cacheIndex = newCacheIndex;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX, oldCacheIndex, newCacheIndex);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getCacheIndex <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Index</em>' containment reference.
-	 * @see #getCacheIndex()
-	 * @generated
-	 */
-	public void setCacheIndex(XmlCacheIndex_2_4 newCacheIndex)
-	{
-		if (newCacheIndex != cacheIndex)
-		{
-			NotificationChain msgs = null;
-			if (cacheIndex != null)
-				msgs = ((InternalEObject)cacheIndex).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX, null, msgs);
-			if (newCacheIndex != null)
-				msgs = ((InternalEObject)newCacheIndex).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX, null, msgs);
-			msgs = basicSetCacheIndex(newCacheIndex, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX, newCacheIndex, newCacheIndex));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Additional Criteria</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additional Criteria</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>Additional Criteria</em>' containment reference.
-	 * @see #setAdditionalCriteria(XmlAdditionalCriteria_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_2_2_AdditionalCriteria()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAdditionalCriteria_2_2 getAdditionalCriteria()
-	{
-		return additionalCriteria;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAdditionalCriteria(XmlAdditionalCriteria_2_2 newAdditionalCriteria, NotificationChain msgs)
-	{
-		XmlAdditionalCriteria_2_2 oldAdditionalCriteria = additionalCriteria;
-		additionalCriteria = newAdditionalCriteria;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA, oldAdditionalCriteria, newAdditionalCriteria);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getAdditionalCriteria <em>Additional Criteria</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Additional Criteria</em>' containment reference.
-	 * @see #getAdditionalCriteria()
-	 * @generated
-	 */
-	public void setAdditionalCriteria(XmlAdditionalCriteria_2_2 newAdditionalCriteria)
-	{
-		if (newAdditionalCriteria != additionalCriteria)
-		{
-			NotificationChain msgs = null;
-			if (additionalCriteria != null)
-				msgs = ((InternalEObject)additionalCriteria).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA, null, msgs);
-			if (newAdditionalCriteria != null)
-				msgs = ((InternalEObject)newAdditionalCriteria).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA, null, msgs);
-			msgs = basicSetAdditionalCriteria(newAdditionalCriteria, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA, newAdditionalCriteria, newAdditionalCriteria));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Default Mappings</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exclude Default Mappings</em>' attribute.
-	 * @see #setExcludeDefaultMappings(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntity_ExcludeDefaultMappings()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getExcludeDefaultMappings()
-	{
-		return excludeDefaultMappings;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Default Mappings</em>' attribute.
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 */
-	public void setExcludeDefaultMappings(Boolean newExcludeDefaultMappings)
-	{
-		Boolean oldExcludeDefaultMappings = excludeDefaultMappings;
-		excludeDefaultMappings = newExcludeDefaultMappings;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS, oldExcludeDefaultMappings, excludeDefaultMappings));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
-				return basicSetPrimaryKey(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
-				return basicSetCacheInterceptor(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
-				return basicSetQueryRedirectors(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
-				return ((InternalEList<?>)getFetchGroups()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
-				return basicSetClassExtractor(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING:
-				return basicSetPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING:
-				return basicSetReplicationPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING:
-				return basicSetRoundRobinPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING:
-				return basicSetPinnedPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING:
-				return basicSetRangePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING:
-				return basicSetValuePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING:
-				return basicSetHashPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING:
-				return basicSetUnionPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA:
-				return basicSetAdditionalCriteria(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__INDEX:
-				return basicSetIndex(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT:
-				return basicSetMultitenant(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES:
-				return ((InternalEList<?>)getNamedStoredFunctionQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return ((InternalEList<?>)getNamedPlsqlStoredFunctionQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return ((InternalEList<?>)getNamedPlsqlStoredProcedureQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS:
-				return ((InternalEList<?>)getPlsqlRecords()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES:
-				return ((InternalEList<?>)getPlsqlTables()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT:
-				return basicSetStruct(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX:
-				return basicSetCacheIndex(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
-				return basicSetCustomizer(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING:
-				return basicSetChangeTracking(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE:
-				return basicSetCache(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS:
-				return ((InternalEList<?>)getConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS:
-				return ((InternalEList<?>)getTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__OBJECT_TYPE_CONVERTERS:
-				return ((InternalEList<?>)getObjectTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT_CONVERTERS:
-				return ((InternalEList<?>)getStructConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
-				return ((InternalEList<?>)getNamedStoredProcedureQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
-				return basicSetOptimisticLocking(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
-				return basicSetCopyPolicy(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY:
-				return basicSetInstantiationCopyPolicy(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY:
-				return basicSetCloneCopyPolicy(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 EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
-				return getPrimaryKey();
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
-				return getCacheInterceptor();
-			case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
-				return getQueryRedirectors();
-			case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
-				return getFetchGroups();
-			case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
-				return getClassExtractor();
-			case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS:
-				return getParentClass();
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED:
-				return getPartitioned();
-			case EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA:
-				return getAdditionalCriteria();
-			case EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE:
-				return getCascadeOnDelete();
-			case EclipseLinkOrmPackage.XML_ENTITY__INDEX:
-				return getIndex();
-			case EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT:
-				return getMultitenant();
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES:
-				return getNamedStoredFunctionQueries();
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return getNamedPlsqlStoredFunctionQueries();
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return getNamedPlsqlStoredProcedureQueries();
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS:
-				return getPlsqlRecords();
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES:
-				return getPlsqlTables();
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT:
-				return getStruct();
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX:
-				return getCacheIndex();
-			case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
-				return getReadOnly();
-			case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
-				return getCustomizer();
-			case EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING:
-				return getChangeTracking();
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE:
-				return getCache();
-			case EclipseLinkOrmPackage.XML_ENTITY__EXISTENCE_CHECKING:
-				return getExistenceChecking();
-			case EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS:
-				return getConverters();
-			case EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS:
-				return getTypeConverters();
-			case EclipseLinkOrmPackage.XML_ENTITY__OBJECT_TYPE_CONVERTERS:
-				return getObjectTypeConverters();
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT_CONVERTERS:
-				return getStructConverters();
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
-				return getNamedStoredProcedureQueries();
-			case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
-				return getOptimisticLocking();
-			case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
-				return getCopyPolicy();
-			case EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY:
-				return getInstantiationCopyPolicy();
-			case EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY:
-				return getCloneCopyPolicy();
-			case EclipseLinkOrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS:
-				return getExcludeDefaultMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
-				setPrimaryKey((XmlPrimaryKey)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
-				setCacheInterceptor((XmlClassReference)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
-				setQueryRedirectors((XmlQueryRedirectors)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
-				getFetchGroups().clear();
-				getFetchGroups().addAll((Collection<? extends XmlFetchGroup>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
-				setClassExtractor((XmlClassReference)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS:
-				setParentClass((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED:
-				setPartitioned((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA:
-				setAdditionalCriteria((XmlAdditionalCriteria_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE:
-				setCascadeOnDelete((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__INDEX:
-				setIndex((XmlIndex_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT:
-				setMultitenant((XmlMultitenant_2_3)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES:
-				getNamedStoredFunctionQueries().clear();
-				getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				getNamedPlsqlStoredFunctionQueries().clear();
-				getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				getNamedPlsqlStoredProcedureQueries().clear();
-				getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS:
-				getPlsqlRecords().clear();
-				getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES:
-				getPlsqlTables().clear();
-				getPlsqlTables().addAll((Collection<? extends XmlPlsqlTable>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT:
-				setStruct((XmlStruct_2_3)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX:
-				setCacheIndex((XmlCacheIndex_2_4)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
-				setReadOnly((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
-				setCustomizer((XmlClassReference)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING:
-				setChangeTracking((XmlChangeTracking)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE:
-				setCache((XmlCache)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__EXISTENCE_CHECKING:
-				setExistenceChecking((ExistenceType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS:
-				getConverters().clear();
-				getConverters().addAll((Collection<? extends XmlConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				getTypeConverters().addAll((Collection<? extends XmlTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				getObjectTypeConverters().addAll((Collection<? extends XmlObjectTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				getStructConverters().addAll((Collection<? extends XmlStructConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
-				getNamedStoredProcedureQueries().clear();
-				getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
-				setOptimisticLocking((XmlOptimisticLocking)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlInstantiationCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCloneCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS:
-				setExcludeDefaultMappings((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
-				setPrimaryKey((XmlPrimaryKey)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
-				setCacheInterceptor((XmlClassReference)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
-				setQueryRedirectors((XmlQueryRedirectors)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
-				getFetchGroups().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
-				setClassExtractor((XmlClassReference)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS:
-				setParentClass(PARENT_CLASS_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED:
-				setPartitioned(PARTITIONED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA:
-				setAdditionalCriteria((XmlAdditionalCriteria_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE:
-				setCascadeOnDelete(CASCADE_ON_DELETE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__INDEX:
-				setIndex((XmlIndex_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT:
-				setMultitenant((XmlMultitenant_2_3)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES:
-				getNamedStoredFunctionQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				getNamedPlsqlStoredFunctionQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				getNamedPlsqlStoredProcedureQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS:
-				getPlsqlRecords().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES:
-				getPlsqlTables().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT:
-				setStruct((XmlStruct_2_3)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX:
-				setCacheIndex((XmlCacheIndex_2_4)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
-				setReadOnly(READ_ONLY_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
-				setCustomizer((XmlClassReference)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING:
-				setChangeTracking((XmlChangeTracking)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE:
-				setCache((XmlCache)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__EXISTENCE_CHECKING:
-				setExistenceChecking(EXISTENCE_CHECKING_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS:
-				getConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
-				getNamedStoredProcedureQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
-				setOptimisticLocking((XmlOptimisticLocking)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlInstantiationCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCloneCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS:
-				setExcludeDefaultMappings(EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY:
-				return primaryKey != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR:
-				return cacheInterceptor != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS:
-				return queryRedirectors != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS:
-				return fetchGroups != null && !fetchGroups.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR:
-				return classExtractor != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS:
-				return PARENT_CLASS_EDEFAULT == null ? parentClass != null : !PARENT_CLASS_EDEFAULT.equals(parentClass);
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING:
-				return partitioning != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING:
-				return pinnedPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING:
-				return rangePartitioning != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING:
-				return valuePartitioning != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING:
-				return hashPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING:
-				return unionPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED:
-				return PARTITIONED_EDEFAULT == null ? partitioned != null : !PARTITIONED_EDEFAULT.equals(partitioned);
-			case EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA:
-				return additionalCriteria != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE:
-				return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete);
-			case EclipseLinkOrmPackage.XML_ENTITY__INDEX:
-				return index != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT:
-				return multitenant != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES:
-				return namedStoredFunctionQueries != null && !namedStoredFunctionQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return namedPlsqlStoredFunctionQueries != null && !namedPlsqlStoredFunctionQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return namedPlsqlStoredProcedureQueries != null && !namedPlsqlStoredProcedureQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS:
-				return plsqlRecords != null && !plsqlRecords.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES:
-				return plsqlTables != null && !plsqlTables.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT:
-				return struct != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX:
-				return cacheIndex != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY:
-				return READ_ONLY_EDEFAULT == null ? readOnly != null : !READ_ONLY_EDEFAULT.equals(readOnly);
-			case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER:
-				return customizer != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING:
-				return changeTracking != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__CACHE:
-				return cache != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__EXISTENCE_CHECKING:
-				return existenceChecking != EXISTENCE_CHECKING_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS:
-				return converters != null && !converters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS:
-				return typeConverters != null && !typeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__OBJECT_TYPE_CONVERTERS:
-				return objectTypeConverters != null && !objectTypeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__STRUCT_CONVERTERS:
-				return structConverters != null && !structConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES:
-				return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY__OPTIMISTIC_LOCKING:
-				return optimisticLocking != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__COPY_POLICY:
-				return copyPolicy != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__INSTANTIATION_COPY_POLICY:
-				return instantiationCopyPolicy != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__CLONE_COPY_POLICY:
-				return cloneCopyPolicy != null;
-			case EclipseLinkOrmPackage.XML_ENTITY__EXCLUDE_DEFAULT_MAPPINGS:
-				return EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT == null ? excludeDefaultMappings != null : !EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT.equals(excludeDefaultMappings);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlEntity_1_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY: return EclipseLinkOrmV1_1Package.XML_ENTITY_11__PRIMARY_KEY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR: return EclipseLinkOrmV2_0Package.XML_ENTITY_20__CACHE_INTERCEPTOR;
-				case EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS: return EclipseLinkOrmV2_0Package.XML_ENTITY_20__QUERY_REDIRECTORS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlFetchGroupContainer_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS: return EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR: return EclipseLinkOrmV2_1Package.XML_ENTITY_21__CLASS_EXTRACTOR;
-				case EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS: return EclipseLinkOrmV2_1Package.XML_ENTITY_21__PARENT_CLASS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA: return EclipseLinkOrmV2_2Package.XML_ENTITY_22__ADDITIONAL_CRITERIA;
-				case EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE: return EclipseLinkOrmV2_2Package.XML_ENTITY_22__CASCADE_ON_DELETE;
-				case EclipseLinkOrmPackage.XML_ENTITY__INDEX: return EclipseLinkOrmV2_2Package.XML_ENTITY_22__INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT: return EclipseLinkOrmV2_3Package.XML_ENTITY_23__MULTITENANT;
-				case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_23__NAMED_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES;
-				case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS: return EclipseLinkOrmV2_3Package.XML_ENTITY_23__PLSQL_RECORDS;
-				case EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES: return EclipseLinkOrmV2_3Package.XML_ENTITY_23__PLSQL_TABLES;
-				case EclipseLinkOrmPackage.XML_ENTITY__STRUCT: return EclipseLinkOrmV2_3Package.XML_ENTITY_23__STRUCT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_4.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX: return EclipseLinkOrmV2_4Package.XML_ENTITY_24__CACHE_INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlReadOnly.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY: return EclipseLinkOrmPackage.XML_READ_ONLY__READ_ONLY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCustomizerHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER: return EclipseLinkOrmPackage.XML_CUSTOMIZER_HOLDER__CUSTOMIZER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlChangeTrackingHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING: return EclipseLinkOrmPackage.XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCacheHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__CACHE: return EclipseLinkOrmPackage.XML_CACHE_HOLDER__CACHE;
-				case EclipseLinkOrmPackage.XML_ENTITY__EXISTENCE_CHECKING: return EclipseLinkOrmPackage.XML_CACHE_HOLDER__EXISTENCE_CHECKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ENTITY__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ENTITY__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlQueryContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__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 == XmlEntity_1_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV1_1Package.XML_ENTITY_11__PRIMARY_KEY: return EclipseLinkOrmPackage.XML_ENTITY__PRIMARY_KEY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_ENTITY_20__CACHE_INTERCEPTOR: return EclipseLinkOrmPackage.XML_ENTITY__CACHE_INTERCEPTOR;
-				case EclipseLinkOrmV2_0Package.XML_ENTITY_20__QUERY_REDIRECTORS: return EclipseLinkOrmPackage.XML_ENTITY__QUERY_REDIRECTORS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ENTITY__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlFetchGroupContainer_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS: return EclipseLinkOrmPackage.XML_ENTITY__FETCH_GROUPS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_ENTITY_21__CLASS_EXTRACTOR: return EclipseLinkOrmPackage.XML_ENTITY__CLASS_EXTRACTOR;
-				case EclipseLinkOrmV2_1Package.XML_ENTITY_21__PARENT_CLASS: return EclipseLinkOrmPackage.XML_ENTITY__PARENT_CLASS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY__UNION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED: return EclipseLinkOrmPackage.XML_ENTITY__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_22__ADDITIONAL_CRITERIA: return EclipseLinkOrmPackage.XML_ENTITY__ADDITIONAL_CRITERIA;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_22__CASCADE_ON_DELETE: return EclipseLinkOrmPackage.XML_ENTITY__CASCADE_ON_DELETE;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_22__INDEX: return EclipseLinkOrmPackage.XML_ENTITY__INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_23__MULTITENANT: return EclipseLinkOrmPackage.XML_ENTITY__MULTITENANT;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_23__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY__NAMED_PLSQL_STORED_PROCEDURE_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_23__PLSQL_RECORDS: return EclipseLinkOrmPackage.XML_ENTITY__PLSQL_RECORDS;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_23__PLSQL_TABLES: return EclipseLinkOrmPackage.XML_ENTITY__PLSQL_TABLES;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_23__STRUCT: return EclipseLinkOrmPackage.XML_ENTITY__STRUCT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntity_2_4.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_4Package.XML_ENTITY_24__CACHE_INDEX: return EclipseLinkOrmPackage.XML_ENTITY__CACHE_INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlReadOnly.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_READ_ONLY__READ_ONLY: return EclipseLinkOrmPackage.XML_ENTITY__READ_ONLY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCustomizerHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CUSTOMIZER_HOLDER__CUSTOMIZER: return EclipseLinkOrmPackage.XML_ENTITY__CUSTOMIZER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlChangeTrackingHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING: return EclipseLinkOrmPackage.XML_ENTITY__CHANGE_TRACKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCacheHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CACHE_HOLDER__CACHE: return EclipseLinkOrmPackage.XML_ENTITY__CACHE;
-				case EclipseLinkOrmPackage.XML_CACHE_HOLDER__EXISTENCE_CHECKING: return EclipseLinkOrmPackage.XML_ENTITY__EXISTENCE_CHECKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlQueryContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY__NAMED_STORED_PROCEDURE_QUERIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_ENTITY__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(" (parentClass: ");
-		result.append(parentClass);
-		result.append(", partitioned: ");
-		result.append(partitioned);
-		result.append(", cascadeOnDelete: ");
-		result.append(cascadeOnDelete);
-		result.append(", readOnly: ");
-		result.append(readOnly);
-		result.append(", existenceChecking: ");
-		result.append(existenceChecking);
-		result.append(", excludeDefaultMappings: ");
-		result.append(excludeDefaultMappings);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getReadOnlyTextRange() {
-		return getAttributeTextRange(EclipseLink.READ_ONLY);
-	}
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlEntity(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildClassTranslator(),
-			buildParentClassTranslator(),
-			buildAccessTranslator(),
-			buildCacheableTranslator(),
-			buildMetadataCompleteTranslator(),
-			buildReadOnlyTranslator(),
-			buildExistenceCheckingTranslator(),
-			buildExcludeDefaultMappingsTranslator(),
-			buildDescriptionTranslator(),
-			buildAccessMethodsTranslator(),
-		    XmlMultitenant.buildTranslator(EclipseLink2_3.MULTITENANT, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntity_2_3_Multitenant()),
-			buildAdditionalCriteriaTranslator(),
-			buildCustomizerTranslator(),
-			buildChangeTrackingTranslator(),
-			buildTableTranslator(),
-			buildSecondaryTableTranslator(),
-			XmlStruct.buildTranslator(EclipseLink2_3.STRUCT, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntity_2_3_Struct()),
-			buildPrimaryKeyJoinColumnTranslator(),
-			buildCascadeOnDeleteTranslator(),
-			buildIndexTranslator(),
-			buildIdClassTranslator(),
-			buildPrimaryKeyTranslator(),
-			buildInheritanceTranslator(),
-			buildDiscriminatorValueTranslator(),
-			buildDiscriminatorColumnTranslator(),
-			buildClassExtractorTranslator(),
-			buildOptimisticLockingTranslator(),
-			buildCacheTranslator(),
-			buildCacheInterceptorTranslator(),
-			buildCacheIndexTranslator(),
-			buildFetchGroupsTranslator(),
-			buildConverterTranslator(),
-			buildTypeConverterTranslator(),
-			buildObjectTypeConverterTranslator(),
-			buildStructConverterTranslator(),
-			buildCopyPolicyTranslator(),
-			buildInstantiationCoypPolicyTranslator(),
-			buildCloneCopyPolicyTranslator(),
-			buildSequenceGeneratorTranslator(),
-			buildTableGeneratorTranslator(),
-		    XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioning()),
-			XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ReplicationPartitioning()),
-			XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RoundRobinPartitioning()),
-			XmlPinnedPartitioning.buildTranslator(EclipseLink2_2.PINNED_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_PinnedPartitioning()),
-			XmlRangePartitioning.buildTranslator(EclipseLink2_2.RANGE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RangePartitioning()),
-			XmlValuePartitioning.buildTranslator(EclipseLink2_2.VALUE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ValuePartitioning()),
-			XmlHashPartitioning.buildTranslator(EclipseLink2_2.HASH_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_HashPartitioning()),
-			XmlUnionPartitioning.buildTranslator(EclipseLink2_2.UNION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_UnionPartitioning()),
-			buildPartitionedTranslator(),
-			buildNamedQueryTranslator(),
-			buildNamedNativeQueryTranslator(),
-			buildNamedStoredProcedureQueryTranslator(),
-			XmlNamedStoredFunctionQuery.buildTranslator(EclipseLink2_3.NAMED_STORED_FUNCTION_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntity_2_3_NamedStoredFunctionQueries()),
-			XmlNamedPlsqlStoredProcedureQuery.buildTranslator(EclipseLink2_3.NAMED_PLSQL_STORED_PROCEDURE_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntity_2_3_NamedPlsqlStoredProcedureQueries()),
-			XmlNamedPlsqlStoredFunctionQuery.buildTranslator(EclipseLink2_3.NAMED_PLSQL_STORED_FUNCTION_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntity_2_3_NamedPlsqlStoredFunctionQueries()),
-			XmlPlsqlRecord.buildTranslator(EclipseLink2_3.PLSQL_RECORD, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntity_2_3_PlsqlRecords()),
-			XmlPlsqlTable.buildTranslator(EclipseLink2_3.PLSQL_TABLE, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntity_2_3_PlsqlTables()),
-			buildSqlResultSetMappingTranslator(),
-			buildQueryRedirectorsTranslator(),
-			buildExcludeDefaultListenersTranslator(),
-			buildExcludeSuperclassListenersTranslator(),
-			buildEntityListenersTranslator(),
-			buildPrePersistTranslator(),
-			buildPostPersistTranslator(),
-			buildPreRemoveTranslator(),
-			buildPostRemoveTranslator(),
-			buildPreUpdateTranslator(),
-			buildPostUpdateTranslator(),
-			buildPostLoadTranslator(),
-			buildPropertyTranslator(),
-			buildAttributeOverrideTranslator(),
-			buildAssociationOverrideTranslator(),
-			Attributes.buildTranslator()};
-	}
-	
-	protected static Translator buildCustomizerTranslator() {
-		return XmlClassReference.buildTranslator(EclipseLink.CUSTOMIZER, EclipseLinkOrmPackage.eINSTANCE.getXmlCustomizerHolder_Customizer());
-	}
-	
-	protected static Translator buildChangeTrackingTranslator() {
-		return XmlChangeTracking.buildTranslator(EclipseLink.CHANGE_TRACKING, EclipseLinkOrmPackage.eINSTANCE.getXmlChangeTrackingHolder_ChangeTracking());
-	}
-	
-	protected static Translator buildPrimaryKeyTranslator() {
-		return XmlPrimaryKey.buildTranslator(EclipseLink1_1.PRIMARY_KEY, EclipseLinkOrmV1_1Package.eINSTANCE.getXmlEntity_1_1_PrimaryKey());
-	}
-	
-	protected static Translator buildClassExtractorTranslator() {
-		return XmlClassReference.buildTranslator(EclipseLink2_1.CLASS_EXTRACTOR, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlEntity_2_1_ClassExtractor());
-	}
-	
-	protected static Translator buildOptimisticLockingTranslator() {
-		return XmlOptimisticLocking.buildTranslator(EclipseLink.OPTIMISTIC_LOCKING, EclipseLinkOrmPackage.eINSTANCE.getXmlEntity_OptimisticLocking());
-	}
-	
-	protected static Translator buildCacheTranslator() {
-		return XmlCache.buildTranslator(EclipseLink.CACHE, EclipseLinkOrmPackage.eINSTANCE.getXmlCacheHolder_Cache());
-	}
-	
-	protected static Translator buildCacheInterceptorTranslator() {
-		return XmlClassReference.buildTranslator(EclipseLink2_0.CACHE_INTERCEPTOR, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlEntity_2_0_CacheInterceptor());
-	}
-
-	protected static Translator buildCacheIndexTranslator() {
-		return XmlCacheIndex.buildTranslator(EclipseLink2_4.CACHE_INDEX, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlEntity_2_4_CacheIndex());
-	}
-	
-	protected static Translator buildFetchGroupsTranslator() {
-		return XmlFetchGroup.buildTranslator(EclipseLink2_1.FETCH_GROUP, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroupContainer_2_1_FetchGroups());
-	}
-	
-	protected static Translator buildQueryRedirectorsTranslator() {
-		return XmlQueryRedirectors.buildTranslator(EclipseLink2_0.QUERY_REDIRECTORS, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlEntity_2_0_QueryRedirectors());
-	}
-	
-	protected static Translator buildConverterTranslator() {
-		return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_Converters());
-	}
-	
-	protected static Translator buildTypeConverterTranslator() {
-		return XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_TypeConverters());
-	}
-	
-	protected static Translator buildObjectTypeConverterTranslator() {
-		return XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_ObjectTypeConverters());
-	}
-	
-	protected static Translator buildStructConverterTranslator() {
-		return XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_StructConverters());
-	}
-	
-	protected static Translator buildCopyPolicyTranslator() {
-		return XmlCopyPolicy.buildTranslator(EclipseLink.COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlEntity_CopyPolicy());
-	}
-	
-	protected static Translator buildInstantiationCoypPolicyTranslator() {
-		return XmlInstantiationCopyPolicy.buildTranslator(EclipseLink.INSTANTIATION_COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlEntity_InstantiationCopyPolicy());
-	}
-	
-	protected static Translator buildCloneCopyPolicyTranslator() {
-		return XmlCloneCopyPolicy.buildTranslator(EclipseLink.CLONE_COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlEntity_CloneCopyPolicy());
-	}
-	
-	protected static Translator buildReadOnlyTranslator() {
-		return new Translator(EclipseLink.READ_ONLY, EclipseLinkOrmPackage.eINSTANCE.getXmlReadOnly_ReadOnly(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildExistenceCheckingTranslator() {
-		return new Translator(EclipseLink.EXISTENCE_CHECKING, EclipseLinkOrmPackage.eINSTANCE.getXmlCacheHolder_ExistenceChecking(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildExcludeDefaultMappingsTranslator() {
-		return new Translator(EclipseLink.EXCLUDE_DEFAULT_MAPPINGS, EclipseLinkOrmPackage.eINSTANCE.getXmlEntity_ExcludeDefaultMappings(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildNamedStoredProcedureQueryTranslator() {
-		return XmlNamedStoredProcedureQuery.buildTranslator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY, EclipseLinkOrmPackage.eINSTANCE.getXmlQueryContainer_NamedStoredProcedureQueries());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildParentClassTranslator() {
-		return new Translator(EclipseLink2_1.PARENT_CLASS, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlEntity_2_1_ParentClass(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildAdditionalCriteriaTranslator() {
-		return XmlAdditionalCriteria.buildTranslator(EclipseLink2_2.ADDITIONAL_CRITERIA, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntity_2_2_AdditionalCriteria());
-	}
-
-	protected static Translator buildCascadeOnDeleteTranslator() {
-		return CascadeType.buildTranslator(EclipseLink2_2.CASCADE_ON_DELETE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntity_2_2_CascadeOnDelete());
-	}
-
-	protected static Translator buildIndexTranslator() {
-		return XmlIndex.buildTranslator(EclipseLink2_2.INDEX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntity_2_2_Index());
-	}
-	
-	protected static Translator buildTableTranslator() {
-		return XmlTable.buildTranslator(JPA.TABLE, OrmPackage.eINSTANCE.getXmlEntity_Table());
-	}
-
-	protected static Translator buildSecondaryTableTranslator() {
-		return XmlSecondaryTable.buildTranslator(JPA.SECONDARY_TABLE, OrmPackage.eINSTANCE.getXmlEntity_SecondaryTables());
-	}	
-	
-	protected static Translator buildTableGeneratorTranslator() {
-		return XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_TableGenerator());
-	}
-
-    protected static Translator buildPartitionedTranslator() {
-		return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
deleted file mode 100644
index db82fc24cc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlEntityMappings.java
+++ /dev/null
@@ -1,1366 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-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.SimpleRootTranslator;
-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.orm.SqlResultSetMapping;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_2.EclipseLink1_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1;
-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.XmlEntityMappings_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Entity Mappings</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings()
- * @model kind="class"
- * @generated
- */
-public class XmlEntityMappings extends org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings implements XmlEntityMappings_2_1, XmlEntityMappings_2_2, XmlEntityMappings_2_3, XmlConvertersHolder, XmlQueryContainer
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPartitioning_2_2> partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlReplicationPartitioning_2_2> replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlRoundRobinPartitioning_2_2> roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPinnedPartitioning_2_2> pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlRangePartitioning_2_2> rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlValuePartitioning_2_2> valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlHashPartitioning_2_2> hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlUnionPartitioning_2_2> unionPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getTenantDiscriminatorColumns() <em>Tenant Discriminator Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTenantDiscriminatorColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns;
-
-	/**
-	 * The cached value of the '{@link #getNamedStoredFunctionQueries() <em>Named Stored Function Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedStoredFunctionQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedStoredFunctionQuery_2_3> namedStoredFunctionQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedPlsqlStoredFunctionQueries() <em>Named Plsql Stored Function Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedPlsqlStoredFunctionQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedPlsqlStoredFunctionQuery_2_3> namedPlsqlStoredFunctionQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedPlsqlStoredProcedureQueries() <em>Named Plsql Stored Procedure Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedPlsqlStoredProcedureQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedPlsqlStoredProcedureQuery_2_3> namedPlsqlStoredProcedureQueries;
-
-	/**
-	 * The cached value of the '{@link #getPlsqlRecords() <em>Plsql Records</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlsqlRecords()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPlsqlRecord_2_3> plsqlRecords;
-
-	/**
-	 * The cached value of the '{@link #getPlsqlTables() <em>Plsql Tables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlsqlTables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPlsqlTable> plsqlTables;
-
-	/**
-	 * The cached value of the '{@link #getConverters() <em>Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlConverter> converters;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTypeConverter> typeConverters;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverters() <em>Object Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlObjectTypeConverter> objectTypeConverters;
-
-	/**
-	 * The cached value of the '{@link #getStructConverters() <em>Struct Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlStructConverter> structConverters;
-
-	/**
-	 * The cached value of the '{@link #getNamedStoredProcedureQueries() <em>Named Stored Procedure Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedStoredProcedureQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedStoredProcedureQuery> namedStoredProcedureQueries;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlEntityMappings()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ENTITY_MAPPINGS;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntityMappings#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPartitioning_2_2> getPartitioning()
-	{
-		if (partitioning == null)
-		{
-			partitioning = new EObjectContainmentEList<XmlPartitioning_2_2>(XmlPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING);
-		}
-		return partitioning;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlReplicationPartitioning_2_2> getReplicationPartitioning()
-	{
-		if (replicationPartitioning == null)
-		{
-			replicationPartitioning = new EObjectContainmentEList<XmlReplicationPartitioning_2_2>(XmlReplicationPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING);
-		}
-		return replicationPartitioning;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlRoundRobinPartitioning_2_2> getRoundRobinPartitioning()
-	{
-		if (roundRobinPartitioning == null)
-		{
-			roundRobinPartitioning = new EObjectContainmentEList<XmlRoundRobinPartitioning_2_2>(XmlRoundRobinPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING);
-		}
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPinnedPartitioning_2_2> getPinnedPartitioning()
-	{
-		if (pinnedPartitioning == null)
-		{
-			pinnedPartitioning = new EObjectContainmentEList<XmlPinnedPartitioning_2_2>(XmlPinnedPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING);
-		}
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlRangePartitioning_2_2> getRangePartitioning()
-	{
-		if (rangePartitioning == null)
-		{
-			rangePartitioning = new EObjectContainmentEList<XmlRangePartitioning_2_2>(XmlRangePartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING);
-		}
-		return rangePartitioning;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlValuePartitioning_2_2> getValuePartitioning()
-	{
-		if (valuePartitioning == null)
-		{
-			valuePartitioning = new EObjectContainmentEList<XmlValuePartitioning_2_2>(XmlValuePartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING);
-		}
-		return valuePartitioning;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlHashPartitioning_2_2> getHashPartitioning()
-	{
-		if (hashPartitioning == null)
-		{
-			hashPartitioning = new EObjectContainmentEList<XmlHashPartitioning_2_2>(XmlHashPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING);
-		}
-		return hashPartitioning;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlUnionPartitioning_2_2> getUnionPartitioning()
-	{
-		if (unionPartitioning == null)
-		{
-			unionPartitioning = new EObjectContainmentEList<XmlUnionPartitioning_2_2>(XmlUnionPartitioning_2_2.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING);
-		}
-		return unionPartitioning;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_TenantDiscriminatorColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns()
-	{
-		if (tenantDiscriminatorColumns == null)
-		{
-			tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS);
-		}
-		return tenantDiscriminatorColumns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_NamedStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries()
-	{
-		if (namedStoredFunctionQueries == null)
-		{
-			namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery_2_3>(XmlNamedStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES);
-		}
-		return namedStoredFunctionQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries()
-	{
-		if (namedPlsqlStoredFunctionQueries == null)
-		{
-			namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery_2_3>(XmlNamedPlsqlStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
-		}
-		return namedPlsqlStoredFunctionQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries()
-	{
-		if (namedPlsqlStoredProcedureQueries == null)
-		{
-			namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery_2_3>(XmlNamedPlsqlStoredProcedureQuery_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
-		}
-		return namedPlsqlStoredProcedureQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Records</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>Plsql Records</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_PlsqlRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPlsqlRecord_2_3> getPlsqlRecords()
-	{
-		if (plsqlRecords == null)
-		{
-			plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS);
-		}
-		return plsqlRecords;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Tables</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>Plsql Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlEntityMappings_2_3_PlsqlTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPlsqlTable> getPlsqlTables()
-	{
-		if (plsqlTables == null)
-		{
-			plsqlTables = new EObjectContainmentEList<XmlPlsqlTable>(XmlPlsqlTable.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES);
-		}
-		return plsqlTables;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converters</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>Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_Converters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlConverter> getConverters()
-	{
-		if (converters == null)
-		{
-			converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS);
-		}
-		return converters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converters</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>Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_TypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTypeConverter> getTypeConverters()
-	{
-		if (typeConverters == null)
-		{
-			typeConverters = new EObjectContainmentEList<XmlTypeConverter>(XmlTypeConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS);
-		}
-		return typeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converters</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>Object Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_ObjectTypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlObjectTypeConverter> getObjectTypeConverters()
-	{
-		if (objectTypeConverters == null)
-		{
-			objectTypeConverters = new EObjectContainmentEList<XmlObjectTypeConverter>(XmlObjectTypeConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS);
-		}
-		return objectTypeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converters</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>Struct Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_StructConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlStructConverter> getStructConverters()
-	{
-		if (structConverters == null)
-		{
-			structConverters = new EObjectContainmentEList<XmlStructConverter>(XmlStructConverter.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS);
-		}
-		return structConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries()
-	{
-		if (namedStoredProcedureQueries == null)
-		{
-			namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery>(XmlNamedStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES);
-		}
-		return namedStoredProcedureQueries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING:
-				return ((InternalEList<?>)getPartitioning()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING:
-				return ((InternalEList<?>)getReplicationPartitioning()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING:
-				return ((InternalEList<?>)getRoundRobinPartitioning()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING:
-				return ((InternalEList<?>)getPinnedPartitioning()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING:
-				return ((InternalEList<?>)getRangePartitioning()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING:
-				return ((InternalEList<?>)getValuePartitioning()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING:
-				return ((InternalEList<?>)getHashPartitioning()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
-				return ((InternalEList<?>)getUnionPartitioning()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
-				return ((InternalEList<?>)getTenantDiscriminatorColumns()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
-				return ((InternalEList<?>)getNamedStoredFunctionQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return ((InternalEList<?>)getNamedPlsqlStoredFunctionQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return ((InternalEList<?>)getNamedPlsqlStoredProcedureQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS:
-				return ((InternalEList<?>)getPlsqlRecords()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES:
-				return ((InternalEList<?>)getPlsqlTables()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS:
-				return ((InternalEList<?>)getConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS:
-				return ((InternalEList<?>)getTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS:
-				return ((InternalEList<?>)getObjectTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS:
-				return ((InternalEList<?>)getStructConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
-				return ((InternalEList<?>)getNamedStoredProcedureQueries()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
-				return getTenantDiscriminatorColumns();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
-				return getNamedStoredFunctionQueries();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return getNamedPlsqlStoredFunctionQueries();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return getNamedPlsqlStoredProcedureQueries();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS:
-				return getPlsqlRecords();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES:
-				return getPlsqlTables();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS:
-				return getConverters();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS:
-				return getTypeConverters();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS:
-				return getObjectTypeConverters();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS:
-				return getStructConverters();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
-				return getNamedStoredProcedureQueries();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING:
-				getPartitioning().clear();
-				getPartitioning().addAll((Collection<? extends XmlPartitioning_2_2>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING:
-				getReplicationPartitioning().clear();
-				getReplicationPartitioning().addAll((Collection<? extends XmlReplicationPartitioning_2_2>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING:
-				getRoundRobinPartitioning().clear();
-				getRoundRobinPartitioning().addAll((Collection<? extends XmlRoundRobinPartitioning_2_2>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING:
-				getPinnedPartitioning().clear();
-				getPinnedPartitioning().addAll((Collection<? extends XmlPinnedPartitioning_2_2>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING:
-				getRangePartitioning().clear();
-				getRangePartitioning().addAll((Collection<? extends XmlRangePartitioning_2_2>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING:
-				getValuePartitioning().clear();
-				getValuePartitioning().addAll((Collection<? extends XmlValuePartitioning_2_2>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING:
-				getHashPartitioning().clear();
-				getHashPartitioning().addAll((Collection<? extends XmlHashPartitioning_2_2>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
-				getUnionPartitioning().clear();
-				getUnionPartitioning().addAll((Collection<? extends XmlUnionPartitioning_2_2>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
-				getTenantDiscriminatorColumns().clear();
-				getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
-				getNamedStoredFunctionQueries().clear();
-				getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				getNamedPlsqlStoredFunctionQueries().clear();
-				getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				getNamedPlsqlStoredProcedureQueries().clear();
-				getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS:
-				getPlsqlRecords().clear();
-				getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES:
-				getPlsqlTables().clear();
-				getPlsqlTables().addAll((Collection<? extends XmlPlsqlTable>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS:
-				getConverters().clear();
-				getConverters().addAll((Collection<? extends XmlConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				getTypeConverters().addAll((Collection<? extends XmlTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				getObjectTypeConverters().addAll((Collection<? extends XmlObjectTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				getStructConverters().addAll((Collection<? extends XmlStructConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
-				getNamedStoredProcedureQueries().clear();
-				getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING:
-				getPartitioning().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING:
-				getReplicationPartitioning().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING:
-				getRoundRobinPartitioning().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING:
-				getPinnedPartitioning().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING:
-				getRangePartitioning().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING:
-				getValuePartitioning().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING:
-				getHashPartitioning().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
-				getUnionPartitioning().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
-				getTenantDiscriminatorColumns().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
-				getNamedStoredFunctionQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				getNamedPlsqlStoredFunctionQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				getNamedPlsqlStoredProcedureQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS:
-				getPlsqlRecords().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES:
-				getPlsqlTables().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS:
-				getConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
-				getNamedStoredProcedureQueries().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING:
-				return partitioning != null && !partitioning.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null && !replicationPartitioning.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null && !roundRobinPartitioning.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING:
-				return pinnedPartitioning != null && !pinnedPartitioning.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING:
-				return rangePartitioning != null && !rangePartitioning.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING:
-				return valuePartitioning != null && !valuePartitioning.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING:
-				return hashPartitioning != null && !hashPartitioning.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING:
-				return unionPartitioning != null && !unionPartitioning.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS:
-				return tenantDiscriminatorColumns != null && !tenantDiscriminatorColumns.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES:
-				return namedStoredFunctionQueries != null && !namedStoredFunctionQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return namedPlsqlStoredFunctionQueries != null && !namedPlsqlStoredFunctionQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return namedPlsqlStoredProcedureQueries != null && !namedPlsqlStoredProcedureQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS:
-				return plsqlRecords != null && !plsqlRecords.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES:
-				return plsqlTables != null && !plsqlTables.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS:
-				return converters != null && !converters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS:
-				return typeConverters != null && !typeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS:
-				return objectTypeConverters != null && !objectTypeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS:
-				return structConverters != null && !structConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES:
-				return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntityMappings_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntityMappings_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__UNION_PARTITIONING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntityMappings_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__PLSQL_RECORDS;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES: return EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__PLSQL_TABLES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlQueryContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES;
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntityMappings_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntityMappings_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_ENTITY_MAPPINGS_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__UNION_PARTITIONING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlEntityMappings_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TENANT_DISCRIMINATOR_COLUMNS;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__PLSQL_RECORDS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_RECORDS;
-				case EclipseLinkOrmV2_3Package.XML_ENTITY_MAPPINGS_23__PLSQL_TABLES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__PLSQL_TABLES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlQueryContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS__NAMED_STORED_PROCEDURE_QUERIES;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-	
-	
-	// **************** version -> schema location mapping ********************
-	
-	private static String namespace = EclipseLink.SCHEMA_NAMESPACE;
-	
-	@Override
-	protected String getNamespace() {
-		return namespace;
-	}
-	
-	private static Map<String, String> versionsToSchemaLocations = buildVersionsToSchemaLocations();
-	
-	private static Map<String, String> buildVersionsToSchemaLocations() {
-		Map<String, String> map = new HashMap<String, String>();
-		map.put(EclipseLink.SCHEMA_VERSION, EclipseLink.SCHEMA_LOCATION);
-		map.put(EclipseLink1_1.SCHEMA_VERSION, EclipseLink1_1.SCHEMA_LOCATION);
-		map.put(EclipseLink1_2.SCHEMA_VERSION, EclipseLink1_2.SCHEMA_LOCATION);
-		map.put(EclipseLink2_0.SCHEMA_VERSION, EclipseLink2_0.SCHEMA_LOCATION);
-		map.put(EclipseLink2_1.SCHEMA_VERSION, EclipseLink2_1.SCHEMA_LOCATION);
-		map.put(EclipseLink2_2.SCHEMA_VERSION, EclipseLink2_2.SCHEMA_LOCATION);
-		map.put(EclipseLink2_3.SCHEMA_VERSION, EclipseLink2_3.SCHEMA_LOCATION);
-		return map;
-	}
-	
-	@Override
-	protected String getSchemaLocationForVersion(String version) {
-		return versionsToSchemaLocations.get(version);
-	}
-	
-	
-	// **************** translators *******************************************
-	
-	private static final Translator ROOT_TRANSLATOR = buildRootTranslator();
-	
-	public static Translator getRootTranslator() {
-		return ROOT_TRANSLATOR;
-	}
-	
-	private static Translator buildRootTranslator() {
-		return new SimpleRootTranslator(
-				JPA.ENTITY_MAPPINGS,
-				EclipseLinkOrmPackage.eINSTANCE.getXmlEntityMappings(),
-				buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildVersionTranslator(versionsToSchemaLocations),
-			buildNamespaceTranslator(namespace),
-			buildSchemaNamespaceTranslator(),
-			buildSchemaLocationTranslator(namespace, versionsToSchemaLocations),
-			buildDescriptionTranslator(),
-			XmlPersistenceUnitMetadata.buildTranslator(JPA.PERSISTENCE_UNIT_METADATA, OrmPackage.eINSTANCE.getXmlEntityMappings_PersistenceUnitMetadata()),
-			buildPackageTranslator(),
-			buildSchemaTranslator(),
-			buildCatalogTranslator(),
-			buildAccessTranslator(),
-			buildAccessMethodsTranslator(),
-			XmlTenantDiscriminatorColumn.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminatorColumns()),
-			XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_Converters()),
-			XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_TypeConverters()),
-			XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_ObjectTypeConverters()),
-			XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_StructConverters()),
-			XmlSequenceGenerator.buildTranslator(JPA.SEQUENCE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_SequenceGenerators()),
-			XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlEntityMappings_TableGenerators()),
-			XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_Partitioning()),
-			XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_ReplicationPartitioning()),
-			XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_RoundRobinPartitioning()),
-			XmlPinnedPartitioning.buildTranslator(EclipseLink2_2.PINNED_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_PinnedPartitioning()),
-			XmlRangePartitioning.buildTranslator(EclipseLink2_2.RANGE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_RangePartitioning()),
-			XmlValuePartitioning.buildTranslator(EclipseLink2_2.VALUE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_ValuePartitioning()),
-			XmlHashPartitioning.buildTranslator(EclipseLink2_2.HASH_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_HashPartitioning()),
-			XmlUnionPartitioning.buildTranslator(EclipseLink2_2.UNION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlEntityMappings_2_2_UnionPartitioning()),
-			XmlNamedQuery.buildTranslator(JPA.NAMED_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedQueries()),
-			XmlNamedNativeQuery.buildTranslator(JPA.NAMED_NATIVE_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedNativeQueries()),
-			XmlNamedStoredProcedureQuery.buildTranslator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY, EclipseLinkOrmPackage.eINSTANCE.getXmlQueryContainer_NamedStoredProcedureQueries()),
-			XmlNamedStoredFunctionQuery.buildTranslator(EclipseLink2_3.NAMED_STORED_FUNCTION_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_NamedStoredFunctionQueries()),
-			XmlNamedPlsqlStoredProcedureQuery.buildTranslator(EclipseLink2_3.NAMED_PLSQL_STORED_PROCEDURE_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries()),
-			XmlNamedPlsqlStoredFunctionQuery.buildTranslator(EclipseLink2_3.NAMED_PLSQL_STORED_FUNCTION_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries()),
-			XmlPlsqlRecord.buildTranslator(EclipseLink2_3.PLSQL_RECORD, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_PlsqlRecords()),
-			XmlPlsqlTable.buildTranslator(EclipseLink2_3.PLSQL_TABLE, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlEntityMappings_2_3_PlsqlTables()),
-			SqlResultSetMapping.buildTranslator(JPA.SQL_RESULT_SET_MAPPING, OrmPackage.eINSTANCE.getXmlEntityMappings_SqlResultSetMappings()),
-			XmlMappedSuperclass.buildTranslator(JPA.MAPPED_SUPERCLASS, OrmPackage.eINSTANCE.getXmlEntityMappings_MappedSuperclasses()),
-			XmlEntity.buildTranslator(JPA.ENTITY, OrmPackage.eINSTANCE.getXmlEntityMappings_Entities()),
-			XmlEmbeddable.buildTranslator(JPA.EMBEDDABLE, OrmPackage.eINSTANCE.getXmlEntityMappings_Embeddables()),
-		};
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-}
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
deleted file mode 100644
index 0a3bde590a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchAttribute.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.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.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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Fetch Attribute</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute()
- * @model kind="class"
- * @generated
- */
-public class XmlFetchAttribute extends AbstractJpaEObject implements XmlFetchAttribute_2_1
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlFetchAttribute()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_FETCH_ATTRIBUTE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchAttribute_2_1_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_ATTRIBUTE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-				elementName,
-				structuralFeature,
-				buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-				buildNameTranslator()};
-	}
-	
-	private static Translator buildNameTranslator() {
-		return new Translator(EclipseLink2_1.NAME, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchAttribute_2_1_Name(), Translator.DOM_ATTRIBUTE);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.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
deleted file mode 100644
index 292ffda1c6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlFetchGroup.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.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;
-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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Fetch Group</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup()
- * @model kind="class"
- * @generated
- */
-public class XmlFetchGroup extends AbstractJpaEObject implements XmlFetchGroup_2_1
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLoad() <em>Load</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoad()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean LOAD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLoad() <em>Load</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoad()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean load = LOAD_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlFetchAttribute> attributes;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlFetchGroup()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_FETCH_GROUP;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup_2_1_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attributes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attributes</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup_2_1_Attributes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlFetchAttribute> getAttributes()
-	{
-		if (attributes == null)
-		{
-			attributes = new EObjectContainmentEList<XmlFetchAttribute>(XmlFetchAttribute.class, this, EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Load</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Load</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Load</em>' attribute.
-	 * @see #setLoad(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroup_2_1_Load()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getLoad()
-	{
-		return load;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup#getLoad <em>Load</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Load</em>' attribute.
-	 * @see #getLoad()
-	 * @generated
-	 */
-	public void setLoad(Boolean newLoad)
-	{
-		Boolean oldLoad = load;
-		load = newLoad;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD, oldLoad, load));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
-				return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD:
-				return getLoad();
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
-				return getAttributes();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD:
-				setLoad((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection<? extends XmlFetchAttribute>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD:
-				setLoad(LOAD_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__LOAD:
-				return LOAD_EDEFAULT == null ? load != null : !LOAD_EDEFAULT.equals(load);
-			case EclipseLinkOrmPackage.XML_FETCH_GROUP__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", load: ");
-		result.append(load);
-		result.append(')');
-		return result.toString();
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-				elementName,
-				structuralFeature,
-				buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-				buildNameTranslator(),
-				buildLoadTranslator(),
-				buildAttributesTranslator()};
-	}
-	
-	private static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Name(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	private static Translator buildAttributesTranslator() {
-		return XmlFetchAttribute.buildTranslator(EclipseLink2_1.ATTRIBUTE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Attributes());
-	}
-	
-	protected static Translator buildLoadTranslator() {
-		return new Translator(EclipseLink2_1.FETCH_GROUP__LOAD, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroup_2_1_Load(), Translator.DOM_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
deleted file mode 100644
index 0a4f63c6ae..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlHashPartitioning.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Hash Partitioning</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlHashPartitioning()
- * @model kind="class"
- * @generated
- */
-public class XmlHashPartitioning extends AbstractJpaEObject implements XmlHashPartitioning_2_2
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlHashPartitioning()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_HASH_PARTITIONING;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlHashPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlHashPartitioning#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_HASH_PARTITIONING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_HASH_PARTITIONING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_HASH_PARTITIONING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_HASH_PARTITIONING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_HASH_PARTITIONING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlHashPartitioning(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator()
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlHashPartitioning_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlHashPartitioning
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java
deleted file mode 100644
index 4ba59442e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlId.java
+++ /dev/null
@@ -1,1256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1;
-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.XmlId_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4;
-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;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Id</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId()
- * @model kind="class"
- * @generated
- */
-public class XmlId extends org.eclipse.jpt.jpa.core.resource.orm.XmlId implements XmlId_2_1, XmlId_2_2, XmlId_2_4, XmlAttributeMapping, XmlMutable, XmlConvertibleMapping
-{
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getIndex() <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlIndex_2_2 index;
-
-	/**
-	 * The cached value of the '{@link #getCacheIndex() <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCacheIndex_2_4 cacheIndex;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The default value of the '{@link #getMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMutable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean MUTABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMutable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean mutable = MUTABLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlConverter converter;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTypeConverter typeConverter;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlObjectTypeConverter objectTypeConverter;
-
-	/**
-	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlStructConverter structConverter;
-
-	/**
-	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONVERT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String convert = CONVERT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlId()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ID;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(XmlIndex_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_2_2_Index()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlIndex_2_2 getIndex()
-	{
-		return index;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIndex(XmlIndex_2_2 newIndex, NotificationChain msgs)
-	{
-		XmlIndex_2_2 oldIndex = index;
-		index = newIndex;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__INDEX, oldIndex, newIndex);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	public void setIndex(XmlIndex_2_2 newIndex)
-	{
-		if (newIndex != index)
-		{
-			NotificationChain msgs = null;
-			if (index != null)
-				msgs = ((InternalEObject)index).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__INDEX, null, msgs);
-			if (newIndex != null)
-				msgs = ((InternalEObject)newIndex).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__INDEX, null, msgs);
-			msgs = basicSetIndex(newIndex, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__INDEX, newIndex, newIndex));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Index</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>Cache Index</em>' containment reference.
-	 * @see #setCacheIndex(XmlCacheIndex_2_4)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId_2_4_CacheIndex()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCacheIndex_2_4 getCacheIndex()
-	{
-		return cacheIndex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCacheIndex(XmlCacheIndex_2_4 newCacheIndex, NotificationChain msgs)
-	{
-		XmlCacheIndex_2_4 oldCacheIndex = cacheIndex;
-		cacheIndex = newCacheIndex;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__CACHE_INDEX, oldCacheIndex, newCacheIndex);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getCacheIndex <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Index</em>' containment reference.
-	 * @see #getCacheIndex()
-	 * @generated
-	 */
-	public void setCacheIndex(XmlCacheIndex_2_4 newCacheIndex)
-	{
-		if (newCacheIndex != cacheIndex)
-		{
-			NotificationChain msgs = null;
-			if (cacheIndex != null)
-				msgs = ((InternalEObject)cacheIndex).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__CACHE_INDEX, null, msgs);
-			if (newCacheIndex != null)
-				msgs = ((InternalEObject)newCacheIndex).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__CACHE_INDEX, null, msgs);
-			msgs = basicSetCacheIndex(newCacheIndex, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__CACHE_INDEX, newCacheIndex, newCacheIndex));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mutable</em>' attribute.
-	 * @see #setMutable(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable_Mutable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getMutable()
-	{
-		return mutable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getMutable <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mutable</em>' attribute.
-	 * @see #getMutable()
-	 * @generated
-	 */
-	public void setMutable(Boolean newMutable)
-	{
-		Boolean oldMutable = mutable;
-		mutable = newMutable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__MUTABLE, oldMutable, mutable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Convert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Convert</em>' attribute.
-	 * @see #setConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getConvert()
-	{
-		return convert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getConvert <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Convert</em>' attribute.
-	 * @see #getConvert()
-	 * @generated
-	 */
-	public void setConvert(String newConvert)
-	{
-		String oldConvert = convert;
-		convert = newConvert;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__CONVERT, oldConvert, convert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ID__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>CustomConverter</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>Converter</em>' containment reference.
-	 * @see #setConverter(XmlConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlConverter getConverter()
-	{
-		return converter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetConverter(XmlConverter newConverter, NotificationChain msgs)
-	{
-		XmlConverter oldConverter = converter;
-		converter = newConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getConverter <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter</em>' containment reference.
-	 * @see #getConverter()
-	 * @generated
-	 */
-	public void setConverter(XmlConverter newConverter)
-	{
-		if (newConverter != converter)
-		{
-			NotificationChain msgs = null;
-			if (converter != null)
-				msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__CONVERTER, newConverter, newConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type CustomConverter</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>Type Converter</em>' containment reference.
-	 * @see #setTypeConverter(XmlTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTypeConverter getTypeConverter()
-	{
-		return typeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTypeConverter(XmlTypeConverter newTypeConverter, NotificationChain msgs)
-	{
-		XmlTypeConverter oldTypeConverter = typeConverter;
-		typeConverter = newTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getTypeConverter <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Converter</em>' containment reference.
-	 * @see #getTypeConverter()
-	 * @generated
-	 */
-	public void setTypeConverter(XmlTypeConverter newTypeConverter)
-	{
-		if (newTypeConverter != typeConverter)
-		{
-			NotificationChain msgs = null;
-			if (typeConverter != null)
-				msgs = ((InternalEObject)typeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER, null, msgs);
-			msgs = basicSetTypeConverter(newTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER, newTypeConverter, newTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type CustomConverter</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>Object Type Converter</em>' containment reference.
-	 * @see #setObjectTypeConverter(XmlObjectTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlObjectTypeConverter getObjectTypeConverter()
-	{
-		return objectTypeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter, NotificationChain msgs)
-	{
-		XmlObjectTypeConverter oldObjectTypeConverter = objectTypeConverter;
-		objectTypeConverter = newObjectTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER, oldObjectTypeConverter, newObjectTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type Converter</em>' containment reference.
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 */
-	public void setObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter)
-	{
-		if (newObjectTypeConverter != objectTypeConverter)
-		{
-			NotificationChain msgs = null;
-			if (objectTypeConverter != null)
-				msgs = ((InternalEObject)objectTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER, null, msgs);
-			msgs = basicSetObjectTypeConverter(newObjectTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER, newObjectTypeConverter, newObjectTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct CustomConverter</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>Struct Converter</em>' containment reference.
-	 * @see #setStructConverter(XmlStructConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlStructConverter getStructConverter()
-	{
-		return structConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStructConverter(XmlStructConverter newStructConverter, NotificationChain msgs)
-	{
-		XmlStructConverter oldStructConverter = structConverter;
-		structConverter = newStructConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId#getStructConverter <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct Converter</em>' containment reference.
-	 * @see #getStructConverter()
-	 * @generated
-	 */
-	public void setStructConverter(XmlStructConverter newStructConverter)
-	{
-		if (newStructConverter != structConverter)
-		{
-			NotificationChain msgs = null;
-			if (structConverter != null)
-				msgs = ((InternalEObject)structConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER, null, msgs);
-			msgs = basicSetStructConverter(newStructConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER, newStructConverter, newStructConverter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ID__INDEX:
-				return basicSetIndex(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX:
-				return basicSetCacheIndex(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ID__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER:
-				return basicSetStructConverter(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 EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_ID__INDEX:
-				return getIndex();
-			case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX:
-				return getCacheIndex();
-			case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ID__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_ID__MUTABLE:
-				return getMutable();
-			case EclipseLinkOrmPackage.XML_ID__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_ID__CONVERT:
-				return getConvert();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__INDEX:
-				setIndex((XmlIndex_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX:
-				setCacheIndex((XmlCacheIndex_2_4)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__MUTABLE:
-				setMutable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__CONVERT:
-				setConvert((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__INDEX:
-				setIndex((XmlIndex_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX:
-				setCacheIndex((XmlCacheIndex_2_4)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ID__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ID__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_ID__INDEX:
-				return index != null;
-			case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX:
-				return cacheIndex != null;
-			case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ID__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_ID__MUTABLE:
-				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_ID__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_ID__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlId_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_ID_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__INDEX: return EclipseLinkOrmV2_2Package.XML_ID_22__INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId_2_4.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__CACHE_INDEX: return EclipseLinkOrmV2_4Package.XML_ID_24__CACHE_INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMutable.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__MUTABLE: return EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ID__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
-				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 == XmlId_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_ID_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_ID__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_ID_22__INDEX: return EclipseLinkOrmPackage.XML_ID__INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlId_2_4.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_4Package.XML_ID_24__CACHE_INDEX: return EclipseLinkOrmPackage.XML_ID__CACHE_INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ID__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_ID__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMutable.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE: return EclipseLinkOrmPackage.XML_ID__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_ID__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ID__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ID__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_ID__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_ID__CONVERT;
-				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(" (attributeType: ");
-		result.append(attributeType);
-		result.append(", mutable: ");
-		result.append(mutable);
-		result.append(", convert: ");
-		result.append(convert);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getMutableTextRange() {
-		return getAttributeTextRange(EclipseLink.MUTABLE);
-	}
-	
-	public TextRange getConvertTextRange() {
-		return getElementTextRange(EclipseLink.CONVERT);
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlId(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator(),
-			buildMutableTranslator(),
-			buildAttributeTypeTranslator(),
-			buildColumnTranslator(),
-			buildIndexTranslator(),
-			buildCacheIndexTranslator(),
-			buildGeneratedValueTranslator(),
-			buildTemporalTranslator(),
-			buildEnumeratedTranslator(),
-			buildConvertTranslator(),
-			buildConverterTranslator(),
-			buildTypeConverterTranslator(),
-			buildObjectTypeConverterTranslator(),
-			buildStructConverterTranslator(),
-			buildTableGeneratorTranslator(),
-			buildSequenceGeneratorTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator()
-		};
-	}
-	
-	protected static Translator buildMutableTranslator() {
-		return new Translator(EclipseLink.MUTABLE, EclipseLinkOrmPackage.eINSTANCE.getXmlMutable_Mutable(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildIndexTranslator() {
-		return XmlIndex.buildTranslator(EclipseLink2_2.INDEX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlId_2_2_Index());
-	}
-
-	protected static Translator buildCacheIndexTranslator() {
-		return XmlCacheIndex.buildTranslator(EclipseLink2_4.CACHE_INDEX, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlId_2_4_CacheIndex());
-	}
-	
-	protected static Translator buildConvertTranslator() {
-		return new Translator(EclipseLink.CONVERT, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertibleMapping_Convert());
-	}
-	
-	protected static Translator buildConverterTranslator() {
-		return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_Converter());
-	}
-	
-	protected static Translator buildTypeConverterTranslator() {
-		return XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_TypeConverter());
-	}
-	
-	protected static Translator buildObjectTypeConverterTranslator() {
-		return XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_ObjectTypeConverter());
-	}
-	
-	protected static Translator buildStructConverterTranslator() {
-		return XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_StructConverter());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlId_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildEnumeratedTranslator() {
-		return new Translator(JPA.ENUMERATED, OrmPackage.eINSTANCE.getXmlConvertibleMapping_Enumerated());
-	}
-
-	protected static Translator buildTableGeneratorTranslator() {
-		return XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_TableGenerator());
-	}
-
-}
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
deleted file mode 100644
index 35a950e5b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlIndex.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-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.BooleanTranslator;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Index</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex()
- * @model kind="class"
- * @generated
- */
-public class XmlIndex extends AbstractJpaEObject implements XmlIndex_2_2
-{
-	/**
-	 * 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 #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SCHEMA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSchema() <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSchema()
-	 * @generated
-	 * @ordered
-	 */
-	protected String schema = SCHEMA_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATALOG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCatalog() <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCatalog()
-	 * @generated
-	 * @ordered
-	 */
-	protected String catalog = CATALOG_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected String table = TABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUnique() <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnique()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean UNIQUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUnique() <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnique()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean unique = UNIQUE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getColumnNames() <em>Column Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumnNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> columnNames;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlIndex()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_INDEX;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_INDEX__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' attribute.
-	 * <!-- 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 #setSchema(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex_2_2_Schema()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getSchema()
-	{
-		return schema;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex#getSchema <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' attribute.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	public void setSchema(String newSchema)
-	{
-		String oldSchema = schema;
-		schema = newSchema;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_INDEX__SCHEMA, oldSchema, schema));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Catalog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Catalog</em>' attribute.
-	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex_2_2_Catalog()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCatalog()
-	{
-		return catalog;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex#getCatalog <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Catalog</em>' attribute.
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	public void setCatalog(String newCatalog)
-	{
-		String oldCatalog = catalog;
-		catalog = newCatalog;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_INDEX__CATALOG, oldCatalog, catalog));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' attribute.
-	 * @see #setTable(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex_2_2_Table()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getTable()
-	{
-		return table;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
-	 * @see #getTable()
-	 * @generated
-	 */
-	public void setTable(String newTable)
-	{
-		String oldTable = table;
-		table = newTable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_INDEX__TABLE, oldTable, table));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unique</em>' attribute.
-	 * @see #setUnique(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex_2_2_Unique()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getUnique()
-	{
-		return unique;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlIndex#getUnique <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unique</em>' attribute.
-	 * @see #getUnique()
-	 * @generated
-	 */
-	public void setUnique(Boolean newUnique)
-	{
-		Boolean oldUnique = unique;
-		unique = newUnique;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_INDEX__UNIQUE, oldUnique, unique));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Column Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Names</em>' attribute list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIndex_2_2_ColumnNames()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public EList<String> getColumnNames()
-	{
-		if (columnNames == null)
-		{
-			columnNames = new EDataTypeEList<String>(String.class, this, EclipseLinkOrmPackage.XML_INDEX__COLUMN_NAMES);
-		}
-		return columnNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_INDEX__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_INDEX__SCHEMA:
-				return getSchema();
-			case EclipseLinkOrmPackage.XML_INDEX__CATALOG:
-				return getCatalog();
-			case EclipseLinkOrmPackage.XML_INDEX__TABLE:
-				return getTable();
-			case EclipseLinkOrmPackage.XML_INDEX__UNIQUE:
-				return getUnique();
-			case EclipseLinkOrmPackage.XML_INDEX__COLUMN_NAMES:
-				return getColumnNames();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_INDEX__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__SCHEMA:
-				setSchema((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__CATALOG:
-				setCatalog((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__TABLE:
-				setTable((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__UNIQUE:
-				setUnique((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__COLUMN_NAMES:
-				getColumnNames().clear();
-				getColumnNames().addAll((Collection<? extends String>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_INDEX__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__SCHEMA:
-				setSchema(SCHEMA_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__CATALOG:
-				setCatalog(CATALOG_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__TABLE:
-				setTable(TABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_INDEX__COLUMN_NAMES:
-				getColumnNames().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_INDEX__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_INDEX__SCHEMA:
-				return SCHEMA_EDEFAULT == null ? schema != null : !SCHEMA_EDEFAULT.equals(schema);
-			case EclipseLinkOrmPackage.XML_INDEX__CATALOG:
-				return CATALOG_EDEFAULT == null ? catalog != null : !CATALOG_EDEFAULT.equals(catalog);
-			case EclipseLinkOrmPackage.XML_INDEX__TABLE:
-				return TABLE_EDEFAULT == null ? table != null : !TABLE_EDEFAULT.equals(table);
-			case EclipseLinkOrmPackage.XML_INDEX__UNIQUE:
-				return UNIQUE_EDEFAULT == null ? unique != null : !UNIQUE_EDEFAULT.equals(unique);
-			case EclipseLinkOrmPackage.XML_INDEX__COLUMN_NAMES:
-				return columnNames != null && !columnNames.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(", schema: ");
-		result.append(schema);
-		result.append(", catalog: ");
-		result.append(catalog);
-		result.append(", table: ");
-		result.append(table);
-		result.append(", unique: ");
-		result.append(unique);
-		result.append(", columnNames: ");
-		result.append(columnNames);
-		result.append(')');
-		return result.toString();
-	}
-
-
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlIndex(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildColumnNameTranslator(),
-			buildNameTranslator(),
-			buildCatalogTranslator(),
-			buildSchemaTranslator(),
-			buildTableTranslator(), 
-			buildUniqueTranslator()
-		};
-	}
-	
-	protected static Translator buildColumnNameTranslator() {
-		return new Translator(EclipseLink2_2.INDEX__COLUMN_NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlIndex_2_2_ColumnNames());
-	}		
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink2_2.INDEX__NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlIndex_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildCatalogTranslator() {
-		return new Translator(EclipseLink2_2.INDEX__CATALOG, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlIndex_2_2_Catalog(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildSchemaTranslator() {
-		return new Translator(EclipseLink2_2.INDEX__SCHEMA, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlIndex_2_2_Schema(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildTableTranslator() {
-		return new Translator(EclipseLink2_2.INDEX__TABLE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlIndex_2_2_Table(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildUniqueTranslator() {
-		return new BooleanTranslator(EclipseLink2_2.INDEX__UNIQUE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlIndex_2_2_Unique(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlIndex
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
deleted file mode 100644
index 6b87d945a7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlInstantiationCopyPolicy.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Instantiation Policy</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.2
- * @since 2.2
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlInstantiationCopyPolicy()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlInstantiationCopyPolicy extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlInstantiationCopyPolicy()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_INSTANTIATION_COPY_POLICY;
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {};
-	}
-
-} // XmlInstantiationPolicy
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
deleted file mode 100644
index ff86a6f6a6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetch.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Join Fetch</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch#getJoinFetch <em>Join Fetch</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlJoinFetch extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Fetch</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	XmlJoinFetchType getJoinFetch();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch#getJoinFetch <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #getJoinFetch()
-	 * @generated
-	 */
-	void setJoinFetch(XmlJoinFetchType value);
-	
-	/**
-	 * Return the {@link TextRange} for the join-fetch element.
-	 */
-	TextRange getJoinFetchTextRange();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetchType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetchType.java
deleted file mode 100644
index aa19b9044f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinFetchType.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-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>Xml Join Fetch Type</b></em>',
- * and utility methods for working with them.
- *  
- * 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.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetchType()
- * @model
- * @generated
- */
-public enum XmlJoinFetchType implements Enumerator
-{
-	/**
-	 * The '<em><b>INNER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INNER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INNER(0, "INNER", "INNER"),
-
-	/**
-	 * The '<em><b>OUTER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OUTER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OUTER(1, "OUTER", "OUTER");
-
-	/**
-	 * The '<em><b>INNER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INNER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INNER
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INNER_VALUE = 0;
-
-	/**
-	 * The '<em><b>OUTER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OUTER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OUTER
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OUTER_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Xml Join Fetch Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final XmlJoinFetchType[] VALUES_ARRAY =
-		new XmlJoinFetchType[]
-		{
-			INNER,
-			OUTER,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Xml Join Fetch Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<XmlJoinFetchType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Xml Join Fetch Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlJoinFetchType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlJoinFetchType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Join Fetch Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlJoinFetchType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlJoinFetchType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Join Fetch Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlJoinFetchType get(int value)
-	{
-		switch (value)
-		{
-			case INNER_VALUE: return INNER;
-			case OUTER_VALUE: return OUTER;
-		}
-		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 XmlJoinFetchType(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;
-	}
-	
-} //XmlJoinFetchType
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
deleted file mode 100644
index dae31a93cf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlJoinTable.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Join Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinTable()
- * @model kind="class"
- * @generated
- */
-public class XmlJoinTable extends org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable implements XmlJoinTable_2_2
-{
-	/**
-	 * The default value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CREATION_SUFFIX_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected String creationSuffix = CREATION_SUFFIX_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlJoinTable()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_JOIN_TABLE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinTable_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCreationSuffix()
-	{
-		return creationSuffix;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinTable#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	public void setCreationSuffix(String newCreationSuffix)
-	{
-		String oldCreationSuffix = creationSuffix;
-		creationSuffix = newCreationSuffix;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_JOIN_TABLE__CREATION_SUFFIX, oldCreationSuffix, creationSuffix));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_JOIN_TABLE__CREATION_SUFFIX:
-				return getCreationSuffix();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_JOIN_TABLE__CREATION_SUFFIX:
-				setCreationSuffix((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_JOIN_TABLE__CREATION_SUFFIX:
-				setCreationSuffix(CREATION_SUFFIX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_JOIN_TABLE__CREATION_SUFFIX:
-				return CREATION_SUFFIX_EDEFAULT == null ? creationSuffix != null : !CREATION_SUFFIX_EDEFAULT.equals(creationSuffix);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlJoinTable_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_TABLE__CREATION_SUFFIX: return EclipseLinkOrmV2_2Package.XML_JOIN_TABLE_22__CREATION_SUFFIX;
-				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 == XmlJoinTable_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_JOIN_TABLE_22__CREATION_SUFFIX: return EclipseLinkOrmPackage.XML_JOIN_TABLE__CREATION_SUFFIX;
-				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(" (creationSuffix: ");
-		result.append(creationSuffix);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlJoinTable(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildCatalogTranslator(),
-			buildSchemaTranslator(),
-			buildCreationSuffixTranslator(),
-			buildJoinColumnTranslator(),
-			buildInverseJoinColumnTranslator(),
-			buildUniqueConstraintTranslator()
-		};
-	}
-
-	protected static Translator buildCreationSuffixTranslator() {
-		return new Translator(EclipseLink2_2.CREATION_SUFFIX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlJoinTable_2_2_CreationSuffix(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlJoinTable
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java
deleted file mode 100644
index f38ce6916a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToMany.java
+++ /dev/null
@@ -1,2182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.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;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride;
-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.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.XmlCollectionMapping_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0;
-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.XmlManyToMany_2_1;
-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.XmlHashPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Many To Many</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany()
- * @model kind="class"
- * @generated
- */
-public class XmlManyToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany implements XmlManyToMany_2_0, XmlManyToMany_2_1, XmlManyToMany_2_2, XmlAttributeMapping, XmlJoinFetch
-{
-	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlConverter converter;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTypeConverter typeConverter;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlObjectTypeConverter objectTypeConverter;
-
-	/**
-	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlStructConverter structConverter;
-
-	/**
-	 * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyAssociationOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
-
-	/**
-	 * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBatchFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlBatchFetch batchFetch;
-
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPartitioning_2_2 partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReplicationPartitioning_2_2 replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRangePartitioning_2_2 rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlValuePartitioning_2_2 valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlHashPartitioning_2_2 hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlUnionPartitioning_2_2 unionPartitioning;
-
-	/**
-	 * The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARTITIONED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected String partitioned = PARTITIONED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CASCADE_ON_DELETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cascadeOnDelete = CASCADE_ON_DELETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNonCacheable() <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNonCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NON_CACHEABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNonCacheable() <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNonCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean nonCacheable = NON_CACHEABLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlManyToMany()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_MANY_TO_MANY;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Fetch</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getJoinFetch <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #getJoinFetch()
-	 * @generated
-	 */
-	public void setJoinFetch(XmlJoinFetchType newJoinFetch)
-	{
-		XmlJoinFetchType oldJoinFetch = joinFetch;
-		joinFetch = newJoinFetch == null ? JOIN_FETCH_EDEFAULT : newJoinFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH, oldJoinFetch, joinFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converter</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>Converter</em>' containment reference.
-	 * @see #setConverter(XmlConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlConverter getConverter()
-	{
-		return converter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetConverter(XmlConverter newConverter, NotificationChain msgs)
-	{
-		XmlConverter oldConverter = converter;
-		converter = newConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getConverter <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter</em>' containment reference.
-	 * @see #getConverter()
-	 * @generated
-	 */
-	public void setConverter(XmlConverter newConverter)
-	{
-		if (newConverter != converter)
-		{
-			NotificationChain msgs = null;
-			if (converter != null)
-				msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER, newConverter, newConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converter</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>Type Converter</em>' containment reference.
-	 * @see #setTypeConverter(XmlTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTypeConverter getTypeConverter()
-	{
-		return typeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTypeConverter(XmlTypeConverter newTypeConverter, NotificationChain msgs)
-	{
-		XmlTypeConverter oldTypeConverter = typeConverter;
-		typeConverter = newTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getTypeConverter <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Converter</em>' containment reference.
-	 * @see #getTypeConverter()
-	 * @generated
-	 */
-	public void setTypeConverter(XmlTypeConverter newTypeConverter)
-	{
-		if (newTypeConverter != typeConverter)
-		{
-			NotificationChain msgs = null;
-			if (typeConverter != null)
-				msgs = ((InternalEObject)typeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER, null, msgs);
-			msgs = basicSetTypeConverter(newTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER, newTypeConverter, newTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converter</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>Object Type Converter</em>' containment reference.
-	 * @see #setObjectTypeConverter(XmlObjectTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlObjectTypeConverter getObjectTypeConverter()
-	{
-		return objectTypeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter, NotificationChain msgs)
-	{
-		XmlObjectTypeConverter oldObjectTypeConverter = objectTypeConverter;
-		objectTypeConverter = newObjectTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER, oldObjectTypeConverter, newObjectTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type Converter</em>' containment reference.
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 */
-	public void setObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter)
-	{
-		if (newObjectTypeConverter != objectTypeConverter)
-		{
-			NotificationChain msgs = null;
-			if (objectTypeConverter != null)
-				msgs = ((InternalEObject)objectTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER, null, msgs);
-			msgs = basicSetObjectTypeConverter(newObjectTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER, newObjectTypeConverter, newObjectTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converter</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>Struct Converter</em>' containment reference.
-	 * @see #setStructConverter(XmlStructConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlStructConverter getStructConverter()
-	{
-		return structConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStructConverter(XmlStructConverter newStructConverter, NotificationChain msgs)
-	{
-		XmlStructConverter oldStructConverter = structConverter;
-		structConverter = newStructConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getStructConverter <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct Converter</em>' containment reference.
-	 * @see #getStructConverter()
-	 * @generated
-	 */
-	public void setStructConverter(XmlStructConverter newStructConverter)
-	{
-		if (newStructConverter != structConverter)
-		{
-			NotificationChain msgs = null;
-			if (structConverter != null)
-				msgs = ((InternalEObject)structConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER, null, msgs);
-			msgs = basicSetStructConverter(newStructConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER, newStructConverter, newStructConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key Association Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
-	{
-		if (mapKeyAssociationOverrides == null)
-		{
-			mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES);
-		}
-		return mapKeyAssociationOverrides;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key Convert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key Convert</em>' attribute.
-	 * @see #setMapKeyConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionMapping_2_0_MapKeyConvert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getMapKeyConvert()
-	{
-		return mapKeyConvert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getMapKeyConvert <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map Key Convert</em>' attribute.
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 */
-	public void setMapKeyConvert(String newMapKeyConvert)
-	{
-		String oldMapKeyConvert = mapKeyConvert;
-		mapKeyConvert = newMapKeyConvert;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT, oldMapKeyConvert, mapKeyConvert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference.
-	 * @see #setBatchFetch(XmlBatchFetch)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlBatchFetch getBatchFetch()
-	{
-		return batchFetch;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs)
-	{
-		XmlBatchFetch oldBatchFetch = batchFetch;
-		batchFetch = newBatchFetch;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH, oldBatchFetch, newBatchFetch);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getBatchFetch <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Fetch</em>' containment reference.
-	 * @see #getBatchFetch()
-	 * @generated
-	 */
-	public void setBatchFetch(XmlBatchFetch newBatchFetch)
-	{
-		if (newBatchFetch != batchFetch)
-		{
-			NotificationChain msgs = null;
-			if (batchFetch != null)
-				msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH, null, msgs);
-			if (newBatchFetch != null)
-				msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH, null, msgs);
-			msgs = basicSetBatchFetch(newBatchFetch, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH, newBatchFetch, newBatchFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPartitioning_2_2 getPartitioning()
-	{
-		return partitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
-	{
-		XmlPartitioning_2_2 oldPartitioning = partitioning;
-		partitioning = newPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING, oldPartitioning, newPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
-	{
-		if (newPartitioning != partitioning)
-		{
-			NotificationChain msgs = null;
-			if (partitioning != null)
-				msgs = ((InternalEObject)partitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING, null, msgs);
-			if (newPartitioning != null)
-				msgs = ((InternalEObject)newPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING, null, msgs);
-			msgs = basicSetPartitioning(newPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING, newPartitioning, newPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
-	{
-		return replicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
-	{
-		XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
-		replicationPartitioning = newReplicationPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING, oldReplicationPartitioning, newReplicationPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
-	{
-		if (newReplicationPartitioning != replicationPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (replicationPartitioning != null)
-				msgs = ((InternalEObject)replicationPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING, null, msgs);
-			if (newReplicationPartitioning != null)
-				msgs = ((InternalEObject)newReplicationPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING, null, msgs);
-			msgs = basicSetReplicationPartitioning(newReplicationPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING, newReplicationPartitioning, newReplicationPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
-	{
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
-	{
-		XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
-		roundRobinPartitioning = newRoundRobinPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING, oldRoundRobinPartitioning, newRoundRobinPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
-	{
-		if (newRoundRobinPartitioning != roundRobinPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (roundRobinPartitioning != null)
-				msgs = ((InternalEObject)roundRobinPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING, null, msgs);
-			if (newRoundRobinPartitioning != null)
-				msgs = ((InternalEObject)newRoundRobinPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING, null, msgs);
-			msgs = basicSetRoundRobinPartitioning(newRoundRobinPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING, newRoundRobinPartitioning, newRoundRobinPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
-	{
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
-	{
-		XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
-		pinnedPartitioning = newPinnedPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING, oldPinnedPartitioning, newPinnedPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
-	{
-		if (newPinnedPartitioning != pinnedPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (pinnedPartitioning != null)
-				msgs = ((InternalEObject)pinnedPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING, null, msgs);
-			if (newPinnedPartitioning != null)
-				msgs = ((InternalEObject)newPinnedPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING, null, msgs);
-			msgs = basicSetPinnedPartitioning(newPinnedPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING, newPinnedPartitioning, newPinnedPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRangePartitioning_2_2 getRangePartitioning()
-	{
-		return rangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
-	{
-		XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
-		rangePartitioning = newRangePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING, oldRangePartitioning, newRangePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
-	{
-		if (newRangePartitioning != rangePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (rangePartitioning != null)
-				msgs = ((InternalEObject)rangePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING, null, msgs);
-			if (newRangePartitioning != null)
-				msgs = ((InternalEObject)newRangePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING, null, msgs);
-			msgs = basicSetRangePartitioning(newRangePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING, newRangePartitioning, newRangePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlValuePartitioning_2_2 getValuePartitioning()
-	{
-		return valuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
-	{
-		XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
-		valuePartitioning = newValuePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING, oldValuePartitioning, newValuePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
-	{
-		if (newValuePartitioning != valuePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (valuePartitioning != null)
-				msgs = ((InternalEObject)valuePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING, null, msgs);
-			if (newValuePartitioning != null)
-				msgs = ((InternalEObject)newValuePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING, null, msgs);
-			msgs = basicSetValuePartitioning(newValuePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING, newValuePartitioning, newValuePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlHashPartitioning_2_2 getHashPartitioning()
-	{
-		return hashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
-	{
-		XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
-		hashPartitioning = newHashPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING, oldHashPartitioning, newHashPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
-	{
-		if (newHashPartitioning != hashPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (hashPartitioning != null)
-				msgs = ((InternalEObject)hashPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING, null, msgs);
-			if (newHashPartitioning != null)
-				msgs = ((InternalEObject)newHashPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING, null, msgs);
-			msgs = basicSetHashPartitioning(newHashPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING, newHashPartitioning, newHashPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlUnionPartitioning_2_2 getUnionPartitioning()
-	{
-		return unionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
-	{
-		XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
-		unionPartitioning = newUnionPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING, oldUnionPartitioning, newUnionPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
-	{
-		if (newUnionPartitioning != unionPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (unionPartitioning != null)
-				msgs = ((InternalEObject)unionPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING, null, msgs);
-			if (newUnionPartitioning != null)
-				msgs = ((InternalEObject)newUnionPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING, null, msgs);
-			msgs = basicSetUnionPartitioning(newUnionPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING, newUnionPartitioning, newUnionPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPartitioned()
-	{
-		return partitioned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	public void setPartitioned(String newPartitioned)
-	{
-		String oldPartitioned = partitioned;
-		partitioned = newPartitioned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED, oldPartitioned, partitioned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCascadeOnDelete()
-	{
-		return cascadeOnDelete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	public void setCascadeOnDelete(Boolean newCascadeOnDelete)
-	{
-		Boolean oldCascadeOnDelete = cascadeOnDelete;
-		cascadeOnDelete = newCascadeOnDelete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__CASCADE_ON_DELETE, oldCascadeOnDelete, cascadeOnDelete));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #setNonCacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany_2_2_NonCacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isNonCacheable()
-	{
-		return nonCacheable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#isNonCacheable <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #isNonCacheable()
-	 * @generated
-	 */
-	public void setNonCacheable(boolean newNonCacheable)
-	{
-		boolean oldNonCacheable = nonCacheable;
-		nonCacheable = newNonCacheable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE, oldNonCacheable, nonCacheable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER:
-				return basicSetStructConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return ((InternalEList<?>)getMapKeyAssociationOverrides()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH:
-				return basicSetBatchFetch(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING:
-				return basicSetPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING:
-				return basicSetReplicationPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				return basicSetRoundRobinPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING:
-				return basicSetPinnedPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING:
-				return basicSetRangePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING:
-				return basicSetValuePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING:
-				return basicSetHashPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING:
-				return basicSetUnionPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return getMapKeyAssociationOverrides();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
-				return getMapKeyConvert();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH:
-				return getBatchFetch();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED:
-				return getPartitioned();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CASCADE_ON_DELETE:
-				return getCascadeOnDelete();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE:
-				return isNonCacheable();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH:
-				return getJoinFetch();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				getMapKeyAssociationOverrides().clear();
-				getMapKeyAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
-				setMapKeyConvert((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED:
-				setPartitioned((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CASCADE_ON_DELETE:
-				setCascadeOnDelete((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE:
-				setNonCacheable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				getMapKeyAssociationOverrides().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
-				setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED:
-				setPartitioned(PARTITIONED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CASCADE_ON_DELETE:
-				setCascadeOnDelete(CASCADE_ON_DELETE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE:
-				setNonCacheable(NON_CACHEABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT:
-				return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH:
-				return batchFetch != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING:
-				return partitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING:
-				return pinnedPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING:
-				return rangePartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING:
-				return valuePartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING:
-				return hashPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING:
-				return unionPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED:
-				return PARTITIONED_EDEFAULT == null ? partitioned != null : !PARTITIONED_EDEFAULT.equals(partitioned);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CASCADE_ON_DELETE:
-				return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete);
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE:
-				return nonCacheable != NON_CACHEABLE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCollectionMapping_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBatchFetchHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__CASCADE_ON_DELETE: return EclipseLinkOrmV2_2Package.XML_MANY_TO_MANY_22__CASCADE_ON_DELETE;
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE: return EclipseLinkOrmV2_2Package.XML_MANY_TO_MANY_22__NON_CACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				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 == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCollectionMapping_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__MAP_KEY_CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBatchFetchHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__UNION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToMany_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_MANY_TO_MANY_22__CASCADE_ON_DELETE: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__CASCADE_ON_DELETE;
-				case EclipseLinkOrmV2_2Package.XML_MANY_TO_MANY_22__NON_CACHEABLE: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__NON_CACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_MANY__JOIN_FETCH;
-				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(" (mapKeyConvert: ");
-		result.append(mapKeyConvert);
-		result.append(", attributeType: ");
-		result.append(attributeType);
-		result.append(", partitioned: ");
-		result.append(partitioned);
-		result.append(", cascadeOnDelete: ");
-		result.append(cascadeOnDelete);
-		result.append(", nonCacheable: ");
-		result.append(nonCacheable);
-		result.append(", joinFetch: ");
-		result.append(joinFetch);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLink.JOIN_FETCH);
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlManyToMany(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildTargetEntityTranslator(),
-			buildFetchTranslator(),
-			buildAccessTranslator(),
-			buildMappedByTranslator(),
-			buildAttributeTypeTranslator(),
-			buildOrderByTranslator(),
-			XmlOrderColumn.buildTranslator(JPA2_0.ORDER_COLUMN, OrmV2_0Package.eINSTANCE.getXmlOrderable_2_0_OrderColumn()),		
-			buildMapKeyTranslator(),
-			buildMapKeyClassTranslator(),
-			buildMapKeyTemporalTranslator(),
-			buildMapKeyEnumeratedTranslator(),
-			buildMapKeyConvertTranslator(),
-			buildMapKeyAttributeOverrideTranslator(),
-			buildMapKeyAssociationOverrideTranslator(),
-			buildMapKeyColumnTranslator(),
-			buildMapKeyJoinColumnTranslator(),
-			buildConverterTranslator(),
-			buildTypeConverterTranslator(),
-			buildObjectTypeConverterTranslator(),
-			buildStructConverterTranslator(),
-			buildJoinTableTranslator(),
-			buildCascadeTranslator(),
-			buildCascadeOnDeleteTranslator(),
-			buildJoinFetchTranslator(),
-			buildBatchFetchTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator(),
-			buildNoncacheableTranslator(),
-		    XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioning()),
-			XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ReplicationPartitioning()),
-			XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RoundRobinPartitioning()),
-			XmlPinnedPartitioning.buildTranslator(EclipseLink2_2.PINNED_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_PinnedPartitioning()),
-			XmlRangePartitioning.buildTranslator(EclipseLink2_2.RANGE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RangePartitioning()),
-			XmlValuePartitioning.buildTranslator(EclipseLink2_2.VALUE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ValuePartitioning()),
-			XmlHashPartitioning.buildTranslator(EclipseLink2_2.HASH_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_HashPartitioning()),
-			XmlUnionPartitioning.buildTranslator(EclipseLink2_2.UNION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_UnionPartitioning()),
-			buildPartitionedTranslator(),
-		};
-	}
-	
-	protected static Translator buildMapKeyConvertTranslator() {
-		return new Translator(JPA2_0.MAP_KEY_CONVERT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCollectionMapping_2_0_MapKeyConvert());
-	}
-	
-	protected static Translator buildMapKeyAttributeOverrideTranslator() {
-		return XmlAttributeOverride.buildTranslator(JPA2_0.MAP_KEY_ATTRIBUTE_OVERRIDE, OrmV2_0Package.eINSTANCE.getXmlMapKeyAttributeOverrideContainer_2_0_MapKeyAttributeOverrides());
-	}
-	
-	protected static Translator buildMapKeyAssociationOverrideTranslator() {
-		return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides());
-	}	
-	
-	protected static Translator buildConverterTranslator() {
-		return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_Converter());
-	}
-	
-	protected static Translator buildTypeConverterTranslator() {
-		return XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_TypeConverter());
-	}
-	
-	protected static Translator buildObjectTypeConverterTranslator() {
-		return XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_ObjectTypeConverter());
-	}
-	
-	protected static Translator buildStructConverterTranslator() {
-		return XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_StructConverter());
-	}
-	
-	protected static Translator buildJoinFetchTranslator() {
-		return new Translator(EclipseLink.JOIN_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlManyToMany_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildBatchFetchTranslator() {
-		return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch());
-	}
-
-	protected static Translator buildCascadeOnDeleteTranslator() {
-		return CascadeType.buildTranslator(EclipseLink2_2.CASCADE_ON_DELETE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlManyToMany_2_2_CascadeOnDelete());
-	}
-
-	protected static Translator buildJoinTableTranslator() {
-		return XmlJoinTable.buildTranslator(JPA.JOIN_TABLE, OrmPackage.eINSTANCE.getXmlJoinTableContainer_JoinTable());
-	}
-	
-	protected static Translator buildNoncacheableTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink2_2.NONCACHEABLE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlManyToMany_2_2_NonCacheable());
-	}
-
-    protected static Translator buildPartitionedTranslator() {
-		return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned());
-	}	
-
-}
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
deleted file mode 100644
index 3f1513c7fe..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlManyToOne.java
+++ /dev/null
@@ -1,1478 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1;
-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.XmlHashPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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.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;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Many To One</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne()
- * @model kind="class"
- * @generated
- */
-public class XmlManyToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne implements XmlManyToOne_2_1, XmlManyToOne_2_2, XmlAttributeMapping, XmlJoinFetch
-{
-	/**
-	 * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBatchFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlBatchFetch batchFetch;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPartitioning_2_2 partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReplicationPartitioning_2_2 replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRangePartitioning_2_2 rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlValuePartitioning_2_2 valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlHashPartitioning_2_2 hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlUnionPartitioning_2_2 unionPartitioning;
-
-	/**
-	 * The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARTITIONED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected String partitioned = PARTITIONED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNonCacheable() <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNonCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NON_CACHEABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNonCacheable() <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNonCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean nonCacheable = NON_CACHEABLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlManyToOne()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_MANY_TO_ONE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference.
-	 * @see #setBatchFetch(XmlBatchFetch)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlBatchFetch getBatchFetch()
-	{
-		return batchFetch;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs)
-	{
-		XmlBatchFetch oldBatchFetch = batchFetch;
-		batchFetch = newBatchFetch;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH, oldBatchFetch, newBatchFetch);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getBatchFetch <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Fetch</em>' containment reference.
-	 * @see #getBatchFetch()
-	 * @generated
-	 */
-	public void setBatchFetch(XmlBatchFetch newBatchFetch)
-	{
-		if (newBatchFetch != batchFetch)
-		{
-			NotificationChain msgs = null;
-			if (batchFetch != null)
-				msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH, null, msgs);
-			if (newBatchFetch != null)
-				msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH, null, msgs);
-			msgs = basicSetBatchFetch(newBatchFetch, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH, newBatchFetch, newBatchFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPartitioning_2_2 getPartitioning()
-	{
-		return partitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
-	{
-		XmlPartitioning_2_2 oldPartitioning = partitioning;
-		partitioning = newPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING, oldPartitioning, newPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
-	{
-		if (newPartitioning != partitioning)
-		{
-			NotificationChain msgs = null;
-			if (partitioning != null)
-				msgs = ((InternalEObject)partitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING, null, msgs);
-			if (newPartitioning != null)
-				msgs = ((InternalEObject)newPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING, null, msgs);
-			msgs = basicSetPartitioning(newPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING, newPartitioning, newPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
-	{
-		return replicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
-	{
-		XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
-		replicationPartitioning = newReplicationPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING, oldReplicationPartitioning, newReplicationPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
-	{
-		if (newReplicationPartitioning != replicationPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (replicationPartitioning != null)
-				msgs = ((InternalEObject)replicationPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING, null, msgs);
-			if (newReplicationPartitioning != null)
-				msgs = ((InternalEObject)newReplicationPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING, null, msgs);
-			msgs = basicSetReplicationPartitioning(newReplicationPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING, newReplicationPartitioning, newReplicationPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
-	{
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
-	{
-		XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
-		roundRobinPartitioning = newRoundRobinPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING, oldRoundRobinPartitioning, newRoundRobinPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
-	{
-		if (newRoundRobinPartitioning != roundRobinPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (roundRobinPartitioning != null)
-				msgs = ((InternalEObject)roundRobinPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING, null, msgs);
-			if (newRoundRobinPartitioning != null)
-				msgs = ((InternalEObject)newRoundRobinPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING, null, msgs);
-			msgs = basicSetRoundRobinPartitioning(newRoundRobinPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING, newRoundRobinPartitioning, newRoundRobinPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
-	{
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
-	{
-		XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
-		pinnedPartitioning = newPinnedPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING, oldPinnedPartitioning, newPinnedPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
-	{
-		if (newPinnedPartitioning != pinnedPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (pinnedPartitioning != null)
-				msgs = ((InternalEObject)pinnedPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING, null, msgs);
-			if (newPinnedPartitioning != null)
-				msgs = ((InternalEObject)newPinnedPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING, null, msgs);
-			msgs = basicSetPinnedPartitioning(newPinnedPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING, newPinnedPartitioning, newPinnedPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRangePartitioning_2_2 getRangePartitioning()
-	{
-		return rangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
-	{
-		XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
-		rangePartitioning = newRangePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING, oldRangePartitioning, newRangePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
-	{
-		if (newRangePartitioning != rangePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (rangePartitioning != null)
-				msgs = ((InternalEObject)rangePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING, null, msgs);
-			if (newRangePartitioning != null)
-				msgs = ((InternalEObject)newRangePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING, null, msgs);
-			msgs = basicSetRangePartitioning(newRangePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING, newRangePartitioning, newRangePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlValuePartitioning_2_2 getValuePartitioning()
-	{
-		return valuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
-	{
-		XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
-		valuePartitioning = newValuePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING, oldValuePartitioning, newValuePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
-	{
-		if (newValuePartitioning != valuePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (valuePartitioning != null)
-				msgs = ((InternalEObject)valuePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING, null, msgs);
-			if (newValuePartitioning != null)
-				msgs = ((InternalEObject)newValuePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING, null, msgs);
-			msgs = basicSetValuePartitioning(newValuePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING, newValuePartitioning, newValuePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlHashPartitioning_2_2 getHashPartitioning()
-	{
-		return hashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
-	{
-		XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
-		hashPartitioning = newHashPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING, oldHashPartitioning, newHashPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
-	{
-		if (newHashPartitioning != hashPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (hashPartitioning != null)
-				msgs = ((InternalEObject)hashPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING, null, msgs);
-			if (newHashPartitioning != null)
-				msgs = ((InternalEObject)newHashPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING, null, msgs);
-			msgs = basicSetHashPartitioning(newHashPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING, newHashPartitioning, newHashPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlUnionPartitioning_2_2 getUnionPartitioning()
-	{
-		return unionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
-	{
-		XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
-		unionPartitioning = newUnionPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING, oldUnionPartitioning, newUnionPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
-	{
-		if (newUnionPartitioning != unionPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (unionPartitioning != null)
-				msgs = ((InternalEObject)unionPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING, null, msgs);
-			if (newUnionPartitioning != null)
-				msgs = ((InternalEObject)newUnionPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING, null, msgs);
-			msgs = basicSetUnionPartitioning(newUnionPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING, newUnionPartitioning, newUnionPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPartitioned()
-	{
-		return partitioned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	public void setPartitioned(String newPartitioned)
-	{
-		String oldPartitioned = partitioned;
-		partitioned = newPartitioned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED, oldPartitioned, partitioned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #setNonCacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne_2_2_NonCacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isNonCacheable()
-	{
-		return nonCacheable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#isNonCacheable <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #isNonCacheable()
-	 * @generated
-	 */
-	public void setNonCacheable(boolean newNonCacheable)
-	{
-		boolean oldNonCacheable = nonCacheable;
-		nonCacheable = newNonCacheable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__NON_CACHEABLE, oldNonCacheable, nonCacheable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Fetch</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getJoinFetch <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #getJoinFetch()
-	 * @generated
-	 */
-	public void setJoinFetch(XmlJoinFetchType newJoinFetch)
-	{
-		XmlJoinFetchType oldJoinFetch = joinFetch;
-		joinFetch = newJoinFetch == null ? JOIN_FETCH_EDEFAULT : newJoinFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FETCH, oldJoinFetch, joinFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToOne#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH:
-				return basicSetBatchFetch(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING:
-				return basicSetPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING:
-				return basicSetReplicationPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return basicSetRoundRobinPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING:
-				return basicSetPinnedPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING:
-				return basicSetRangePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING:
-				return basicSetValuePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING:
-				return basicSetHashPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING:
-				return basicSetUnionPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH:
-				return getBatchFetch();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED:
-				return getPartitioned();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__NON_CACHEABLE:
-				return isNonCacheable();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FETCH:
-				return getJoinFetch();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED:
-				setPartitioned((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__NON_CACHEABLE:
-				setNonCacheable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED:
-				setPartitioned(PARTITIONED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__NON_CACHEABLE:
-				setNonCacheable(NON_CACHEABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH:
-				return batchFetch != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING:
-				return partitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING:
-				return pinnedPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING:
-				return rangePartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING:
-				return valuePartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING:
-				return hashPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING:
-				return unionPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED:
-				return PARTITIONED_EDEFAULT == null ? partitioned != null : !PARTITIONED_EDEFAULT.equals(partitioned);
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__NON_CACHEABLE:
-				return nonCacheable != NON_CACHEABLE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlBatchFetchHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToOne_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToOne_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__NON_CACHEABLE: return EclipseLinkOrmV2_2Package.XML_MANY_TO_ONE_22__NON_CACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				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 == XmlBatchFetchHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToOne_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__UNION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlManyToOne_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_MANY_TO_ONE_22__NON_CACHEABLE: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__NON_CACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_MANY_TO_ONE__JOIN_FETCH;
-				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(" (partitioned: ");
-		result.append(partitioned);
-		result.append(", nonCacheable: ");
-		result.append(nonCacheable);
-		result.append(", joinFetch: ");
-		result.append(joinFetch);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLink.JOIN_FETCH);
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlManyToOne(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildTargetEntityTranslator(),
-			buildFetchTranslator(),
-			buildOptionalTranslator(),
-			buildAccessTranslator(),
-			buildMapsIdTranslator(),
-			buildIdTranslator(),
-			buildJoinColumnTranslator(),
-			buildJoinTableTranslator(),
-			buildCascadeTranslator(),
-			buildJoinFetchTranslator(),
-			buildBatchFetchTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator(),
-			buildNoncacheableTranslator(),
-		    XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioning()),
-			XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ReplicationPartitioning()),
-			XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RoundRobinPartitioning()),
-			XmlPinnedPartitioning.buildTranslator(EclipseLink2_2.PINNED_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_PinnedPartitioning()),
-			XmlRangePartitioning.buildTranslator(EclipseLink2_2.RANGE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RangePartitioning()),
-			XmlValuePartitioning.buildTranslator(EclipseLink2_2.VALUE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ValuePartitioning()),
-			XmlHashPartitioning.buildTranslator(EclipseLink2_2.HASH_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_HashPartitioning()),
-			XmlUnionPartitioning.buildTranslator(EclipseLink2_2.UNION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_UnionPartitioning()),
-			buildPartitionedTranslator(),
-		};
-	}
-	
-	protected static Translator buildPrivateOwnedTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink.PRIVATE_OWNED, EclipseLinkOrmPackage.eINSTANCE.getXmlPrivateOwned_PrivateOwned());
-	}
-	
-	protected static Translator buildJoinFetchTranslator() {
-		return new Translator(EclipseLink.JOIN_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildBatchFetchTranslator() {
-		return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch());
-	}
-
-	protected static Translator buildJoinTableTranslator() {
-		return XmlJoinTable.buildTranslator(JPA.JOIN_TABLE, OrmPackage.eINSTANCE.getXmlJoinTableContainer_JoinTable());
-	}
-
-	protected static Translator buildNoncacheableTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink2_2.NONCACHEABLE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlManyToOne_2_2_NonCacheable());
-	}
-
-    protected static Translator buildPartitionedTranslator() {
-		return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned());
-	}
-   
-}
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
deleted file mode 100644
index 3c4a6ef302..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMappedSuperclass.java
+++ /dev/null
@@ -1,3975 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.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;
-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.orm.SqlResultSetMapping;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverrideContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverrideContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlQueryContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator;
-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.XmlCacheable_2_0;
-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.XmlMappedSuperclass_1_1;
-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.XmlMappedSuperclass_2_0;
-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.XmlFetchGroupContainer_2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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.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.XmlMultitenant_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Mapped Superclass</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getOptimisticLocking <em>Optimistic Locking</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCopyPolicy <em>Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCloneCopyPolicy <em>Clone Copy Policy</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass()
- * @model kind="class"
- * @generated
- */
-public class XmlMappedSuperclass extends org.eclipse.jpt.jpa.core.resource.orm.XmlMappedSuperclass implements XmlMappedSuperclass_1_1, XmlMappedSuperclass_2_0, XmlMappedSuperclass_2_1, XmlMappedSuperclass_2_2, XmlMappedSuperclass_2_3, XmlMappedSuperclass_2_4, XmlReadOnly, XmlCustomizerHolder, XmlChangeTrackingHolder, XmlCacheHolder, XmlConvertersHolder, XmlPropertyContainer
-{
-	/**
-	 * The cached value of the '{@link #getPrimaryKey() <em>Primary Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimaryKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPrimaryKey primaryKey;
-
-	/**
-	 * The default value of the '{@link #getCacheable() <em>Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CACHEABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCacheable() <em>Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cacheable = CACHEABLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCacheInterceptor() <em>Cache Interceptor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheInterceptor()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlClassReference cacheInterceptor;
-
-	/**
-	 * The cached value of the '{@link #getAssociationOverrides() <em>Association Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAssociationOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAssociationOverride> associationOverrides;
-
-	/**
-	 * The cached value of the '{@link #getAttributeOverrides() <em>Attribute Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAttributeOverride> attributeOverrides;
-
-	/**
-	 * The cached value of the '{@link #getFetchGroups() <em>Fetch Groups</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFetchGroups()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlFetchGroup> fetchGroups;
-
-	/**
-	 * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSequenceGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlSequenceGenerator sequenceGenerator;
-
-	/**
-	 * The cached value of the '{@link #getTableGenerator() <em>Table Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTableGenerator()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTableGenerator tableGenerator;
-
-	/**
-	 * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedQuery> namedQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedNativeQueries() <em>Named Native Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedNativeQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedNativeQuery> namedNativeQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedStoredProcedureQueries() <em>Named Stored Procedure Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedStoredProcedureQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedStoredProcedureQuery> namedStoredProcedureQueries;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getSqlResultSetMappings() <em>Sql Result Set Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSqlResultSetMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SqlResultSetMapping> sqlResultSetMappings;
-
-	/**
-	 * The cached value of the '{@link #getQueryRedirectors() <em>Query Redirectors</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueryRedirectors()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlQueryRedirectors queryRedirectors;
-
-	/**
-	 * The default value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARENT_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParentClass() <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParentClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String parentClass = PARENT_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPartitioning_2_2 partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReplicationPartitioning_2_2 replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRangePartitioning_2_2 rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlValuePartitioning_2_2 valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlHashPartitioning_2_2 hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlUnionPartitioning_2_2 unionPartitioning;
-
-	/**
-	 * The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARTITIONED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected String partitioned = PARTITIONED_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAdditionalCriteria() <em>Additional Criteria</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdditionalCriteria()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAdditionalCriteria_2_2 additionalCriteria;
-
-	/**
-	 * The cached value of the '{@link #getMultitenant() <em>Multitenant</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMultitenant()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlMultitenant_2_3 multitenant;
-
-	/**
-	 * The cached value of the '{@link #getNamedStoredFunctionQueries() <em>Named Stored Function Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedStoredFunctionQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedStoredFunctionQuery_2_3> namedStoredFunctionQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedPlsqlStoredFunctionQueries() <em>Named Plsql Stored Function Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedPlsqlStoredFunctionQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedPlsqlStoredFunctionQuery_2_3> namedPlsqlStoredFunctionQueries;
-
-	/**
-	 * The cached value of the '{@link #getNamedPlsqlStoredProcedureQueries() <em>Named Plsql Stored Procedure Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamedPlsqlStoredProcedureQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlNamedPlsqlStoredProcedureQuery_2_3> namedPlsqlStoredProcedureQueries;
-
-	/**
-	 * The cached value of the '{@link #getPlsqlRecords() <em>Plsql Records</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlsqlRecords()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPlsqlRecord_2_3> plsqlRecords;
-
-	/**
-	 * The cached value of the '{@link #getPlsqlTables() <em>Plsql Tables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPlsqlTables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlPlsqlTable> plsqlTables;
-
-	/**
-	 * The cached value of the '{@link #getCacheIndex() <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCacheIndex_2_4 cacheIndex;
-
-	/**
-	 * The default value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean READ_ONLY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReadOnly() <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean readOnly = READ_ONLY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCustomizer() <em>Customizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizer()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlClassReference customizer;
-
-	/**
-	 * The cached value of the '{@link #getChangeTracking() <em>Change Tracking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChangeTracking()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlChangeTracking changeTracking;
-
-	/**
-	 * The cached value of the '{@link #getCache() <em>Cache</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCache()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCache cache;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final ExistenceType EXISTENCE_CHECKING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExistenceChecking() <em>Existence Checking</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExistenceChecking()
-	 * @generated
-	 * @ordered
-	 */
-	protected ExistenceType existenceChecking = EXISTENCE_CHECKING_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConverters() <em>Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlConverter> converters;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverters() <em>Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTypeConverter> typeConverters;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverters() <em>Object Type Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlObjectTypeConverter> objectTypeConverters;
-
-	/**
-	 * The cached value of the '{@link #getStructConverters() <em>Struct Converters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlStructConverter> structConverters;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The cached value of the '{@link #getOptimisticLocking() <em>Optimistic Locking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOptimisticLocking()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlOptimisticLocking optimisticLocking;
-
-	/**
-	 * The cached value of the '{@link #getCopyPolicy() <em>Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCopyPolicy copyPolicy;
-
-	/**
-	 * The cached value of the '{@link #getInstantiationCopyPolicy() <em>Instantiation Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInstantiationCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlInstantiationCopyPolicy instantiationCopyPolicy;
-
-	/**
-	 * The cached value of the '{@link #getCloneCopyPolicy() <em>Clone Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCloneCopyPolicy()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlCloneCopyPolicy cloneCopyPolicy;
-
-	/**
-	 * The default value of the '{@link #getExcludeDefaultMappings() <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExcludeDefaultMappings() <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean excludeDefaultMappings = EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlMappedSuperclass()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_MAPPED_SUPERCLASS;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly_ReadOnly()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getReadOnly()
-	{
-		return readOnly;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getReadOnly <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Only</em>' attribute.
-	 * @see #getReadOnly()
-	 * @generated
-	 */
-	public void setReadOnly(Boolean newReadOnly)
-	{
-		Boolean oldReadOnly = readOnly;
-		readOnly = newReadOnly;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY, oldReadOnly, readOnly));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Customizer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Customizer</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>Customizer</em>' containment reference.
-	 * @see #setCustomizer(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCustomizerHolder_Customizer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlClassReference getCustomizer()
-	{
-		return customizer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCustomizer(XmlClassReference newCustomizer, NotificationChain msgs)
-	{
-		XmlClassReference oldCustomizer = customizer;
-		customizer = newCustomizer;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER, oldCustomizer, newCustomizer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCustomizer <em>Customizer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Customizer</em>' containment reference.
-	 * @see #getCustomizer()
-	 * @generated
-	 */
-	public void setCustomizer(XmlClassReference newCustomizer)
-	{
-		if (newCustomizer != customizer)
-		{
-			NotificationChain msgs = null;
-			if (customizer != null)
-				msgs = ((InternalEObject)customizer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER, null, msgs);
-			if (newCustomizer != null)
-				msgs = ((InternalEObject)newCustomizer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER, null, msgs);
-			msgs = basicSetCustomizer(newCustomizer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER, newCustomizer, newCustomizer));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Change Tracking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Change Tracking</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>Change Tracking</em>' containment reference.
-	 * @see #setChangeTracking(XmlChangeTracking)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlChangeTrackingHolder_ChangeTracking()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlChangeTracking getChangeTracking()
-	{
-		return changeTracking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetChangeTracking(XmlChangeTracking newChangeTracking, NotificationChain msgs)
-	{
-		XmlChangeTracking oldChangeTracking = changeTracking;
-		changeTracking = newChangeTracking;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING, oldChangeTracking, newChangeTracking);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getChangeTracking <em>Change Tracking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Change Tracking</em>' containment reference.
-	 * @see #getChangeTracking()
-	 * @generated
-	 */
-	public void setChangeTracking(XmlChangeTracking newChangeTracking)
-	{
-		if (newChangeTracking != changeTracking)
-		{
-			NotificationChain msgs = null;
-			if (changeTracking != null)
-				msgs = ((InternalEObject)changeTracking).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING, null, msgs);
-			if (newChangeTracking != null)
-				msgs = ((InternalEObject)newChangeTracking).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING, null, msgs);
-			msgs = basicSetChangeTracking(newChangeTracking, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING, newChangeTracking, newChangeTracking));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache</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>Cache</em>' containment reference.
-	 * @see #setCache(XmlCache)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_Cache()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCache getCache()
-	{
-		return cache;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCache(XmlCache newCache, NotificationChain msgs)
-	{
-		XmlCache oldCache = cache;
-		cache = newCache;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE, oldCache, newCache);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCache <em>Cache</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache</em>' containment reference.
-	 * @see #getCache()
-	 * @generated
-	 */
-	public void setCache(XmlCache newCache)
-	{
-		if (newCache != cache)
-		{
-			NotificationChain msgs = null;
-			if (cache != null)
-				msgs = ((InternalEObject)cache).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE, null, msgs);
-			if (newCache != null)
-				msgs = ((InternalEObject)newCache).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE, null, msgs);
-			msgs = basicSetCache(newCache, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE, newCache, newCache));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Existence Checking</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Existence Checking</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Existence Checking</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-	 * @see #setExistenceChecking(ExistenceType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheHolder_ExistenceChecking()
-	 * @model default=""
-	 * @generated
-	 */
-	public ExistenceType getExistenceChecking()
-	{
-		return existenceChecking;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getExistenceChecking <em>Existence Checking</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Existence Checking</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.ExistenceType
-	 * @see #getExistenceChecking()
-	 * @generated
-	 */
-	public void setExistenceChecking(ExistenceType newExistenceChecking)
-	{
-		ExistenceType oldExistenceChecking = existenceChecking;
-		existenceChecking = newExistenceChecking == null ? EXISTENCE_CHECKING_EDEFAULT : newExistenceChecking;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING, oldExistenceChecking, existenceChecking));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converters</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>Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_Converters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlConverter> getConverters()
-	{
-		if (converters == null)
-		{
-			converters = new EObjectContainmentEList<XmlConverter>(XmlConverter.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS);
-		}
-		return converters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converters</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>Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_TypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTypeConverter> getTypeConverters()
-	{
-		if (typeConverters == null)
-		{
-			typeConverters = new EObjectContainmentEList<XmlTypeConverter>(XmlTypeConverter.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS);
-		}
-		return typeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converters</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>Object Type Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_ObjectTypeConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlObjectTypeConverter> getObjectTypeConverters()
-	{
-		if (objectTypeConverters == null)
-		{
-			objectTypeConverters = new EObjectContainmentEList<XmlObjectTypeConverter>(XmlObjectTypeConverter.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS);
-		}
-		return objectTypeConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converters</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>Struct Converters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertersHolder_StructConverters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlStructConverter> getStructConverters()
-	{
-		if (structConverters == null)
-		{
-			structConverters = new EObjectContainmentEList<XmlStructConverter>(XmlStructConverter.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS);
-		}
-		return structConverters;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Optimistic Locking</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optimistic Locking</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>Optimistic Locking</em>' containment reference.
-	 * @see #setOptimisticLocking(XmlOptimisticLocking)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_OptimisticLocking()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlOptimisticLocking getOptimisticLocking()
-	{
-		return optimisticLocking;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOptimisticLocking(XmlOptimisticLocking newOptimisticLocking, NotificationChain msgs)
-	{
-		XmlOptimisticLocking oldOptimisticLocking = optimisticLocking;
-		optimisticLocking = newOptimisticLocking;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING, oldOptimisticLocking, newOptimisticLocking);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getOptimisticLocking <em>Optimistic Locking</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optimistic Locking</em>' containment reference.
-	 * @see #getOptimisticLocking()
-	 * @generated
-	 */
-	public void setOptimisticLocking(XmlOptimisticLocking newOptimisticLocking)
-	{
-		if (newOptimisticLocking != optimisticLocking)
-		{
-			NotificationChain msgs = null;
-			if (optimisticLocking != null)
-				msgs = ((InternalEObject)optimisticLocking).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING, null, msgs);
-			if (newOptimisticLocking != null)
-				msgs = ((InternalEObject)newOptimisticLocking).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING, null, msgs);
-			msgs = basicSetOptimisticLocking(newOptimisticLocking, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING, newOptimisticLocking, newOptimisticLocking));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Copy 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>Copy Policy</em>' containment reference.
-	 * @see #setCopyPolicy(XmlCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_CopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCopyPolicy getCopyPolicy()
-	{
-		return copyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCopyPolicy(XmlCopyPolicy newCopyPolicy, NotificationChain msgs)
-	{
-		XmlCopyPolicy oldCopyPolicy = copyPolicy;
-		copyPolicy = newCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY, oldCopyPolicy, newCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCopyPolicy <em>Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Copy Policy</em>' containment reference.
-	 * @see #getCopyPolicy()
-	 * @generated
-	 */
-	public void setCopyPolicy(XmlCopyPolicy newCopyPolicy)
-	{
-		if (newCopyPolicy != copyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (copyPolicy != null)
-				msgs = ((InternalEObject)copyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY, null, msgs);
-			if (newCopyPolicy != null)
-				msgs = ((InternalEObject)newCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY, null, msgs);
-			msgs = basicSetCopyPolicy(newCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY, newCopyPolicy, newCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Instantiation Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Instantiation Copy 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>Instantiation Copy Policy</em>' containment reference.
-	 * @see #setInstantiationCopyPolicy(XmlInstantiationCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_InstantiationCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlInstantiationCopyPolicy getInstantiationCopyPolicy()
-	{
-		return instantiationCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInstantiationCopyPolicy(XmlInstantiationCopyPolicy newInstantiationCopyPolicy, NotificationChain msgs)
-	{
-		XmlInstantiationCopyPolicy oldInstantiationCopyPolicy = instantiationCopyPolicy;
-		instantiationCopyPolicy = newInstantiationCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY, oldInstantiationCopyPolicy, newInstantiationCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getInstantiationCopyPolicy <em>Instantiation Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Instantiation Copy Policy</em>' containment reference.
-	 * @see #getInstantiationCopyPolicy()
-	 * @generated
-	 */
-	public void setInstantiationCopyPolicy(XmlInstantiationCopyPolicy newInstantiationCopyPolicy)
-	{
-		if (newInstantiationCopyPolicy != instantiationCopyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (instantiationCopyPolicy != null)
-				msgs = ((InternalEObject)instantiationCopyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY, null, msgs);
-			if (newInstantiationCopyPolicy != null)
-				msgs = ((InternalEObject)newInstantiationCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY, null, msgs);
-			msgs = basicSetInstantiationCopyPolicy(newInstantiationCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY, newInstantiationCopyPolicy, newInstantiationCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Clone Copy Policy</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Clone Copy 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>Clone Copy Policy</em>' containment reference.
-	 * @see #setCloneCopyPolicy(XmlCloneCopyPolicy)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_CloneCopyPolicy()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCloneCopyPolicy getCloneCopyPolicy()
-	{
-		return cloneCopyPolicy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCloneCopyPolicy(XmlCloneCopyPolicy newCloneCopyPolicy, NotificationChain msgs)
-	{
-		XmlCloneCopyPolicy oldCloneCopyPolicy = cloneCopyPolicy;
-		cloneCopyPolicy = newCloneCopyPolicy;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY, oldCloneCopyPolicy, newCloneCopyPolicy);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCloneCopyPolicy <em>Clone Copy Policy</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Clone Copy Policy</em>' containment reference.
-	 * @see #getCloneCopyPolicy()
-	 * @generated
-	 */
-	public void setCloneCopyPolicy(XmlCloneCopyPolicy newCloneCopyPolicy)
-	{
-		if (newCloneCopyPolicy != cloneCopyPolicy)
-		{
-			NotificationChain msgs = null;
-			if (cloneCopyPolicy != null)
-				msgs = ((InternalEObject)cloneCopyPolicy).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY, null, msgs);
-			if (newCloneCopyPolicy != null)
-				msgs = ((InternalEObject)newCloneCopyPolicy).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY, null, msgs);
-			msgs = basicSetCloneCopyPolicy(newCloneCopyPolicy, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY, newCloneCopyPolicy, newCloneCopyPolicy));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key</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>Primary Key</em>' containment reference.
-	 * @see #setPrimaryKey(XmlPrimaryKey)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_1_1_PrimaryKey()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPrimaryKey getPrimaryKey()
-	{
-		return primaryKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPrimaryKey(XmlPrimaryKey newPrimaryKey, NotificationChain msgs)
-	{
-		XmlPrimaryKey oldPrimaryKey = primaryKey;
-		primaryKey = newPrimaryKey;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY, oldPrimaryKey, newPrimaryKey);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getPrimaryKey <em>Primary Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key</em>' containment reference.
-	 * @see #getPrimaryKey()
-	 * @generated
-	 */
-	public void setPrimaryKey(XmlPrimaryKey newPrimaryKey)
-	{
-		if (newPrimaryKey != primaryKey)
-		{
-			NotificationChain msgs = null;
-			if (primaryKey != null)
-				msgs = ((InternalEObject)primaryKey).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY, null, msgs);
-			if (newPrimaryKey != null)
-				msgs = ((InternalEObject)newPrimaryKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY, null, msgs);
-			msgs = basicSetPrimaryKey(newPrimaryKey, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY, newPrimaryKey, newPrimaryKey));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cacheable</em>' attribute.
-	 * @see #setCacheable(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheable_2_0_Cacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCacheable()
-	{
-		return cacheable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCacheable <em>Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cacheable</em>' attribute.
-	 * @see #getCacheable()
-	 * @generated
-	 */
-	public void setCacheable(Boolean newCacheable)
-	{
-		Boolean oldCacheable = cacheable;
-		cacheable = newCacheable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE, oldCacheable, cacheable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache Interceptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Interceptor</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>Cache Interceptor</em>' containment reference.
-	 * @see #setCacheInterceptor(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_0_CacheInterceptor()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlClassReference getCacheInterceptor()
-	{
-		return cacheInterceptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCacheInterceptor(XmlClassReference newCacheInterceptor, NotificationChain msgs)
-	{
-		XmlClassReference oldCacheInterceptor = cacheInterceptor;
-		cacheInterceptor = newCacheInterceptor;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR, oldCacheInterceptor, newCacheInterceptor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Interceptor</em>' containment reference.
-	 * @see #getCacheInterceptor()
-	 * @generated
-	 */
-	public void setCacheInterceptor(XmlClassReference newCacheInterceptor)
-	{
-		if (newCacheInterceptor != cacheInterceptor)
-		{
-			NotificationChain msgs = null;
-			if (cacheInterceptor != null)
-				msgs = ((InternalEObject)cacheInterceptor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR, null, msgs);
-			if (newCacheInterceptor != null)
-				msgs = ((InternalEObject)newCacheInterceptor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR, null, msgs);
-			msgs = basicSetCacheInterceptor(newCacheInterceptor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR, newCacheInterceptor, newCacheInterceptor));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Association Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAssociationOverrideContainer_AssociationOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAssociationOverride> getAssociationOverrides()
-	{
-		if (associationOverrides == null)
-		{
-			associationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES);
-		}
-		return associationOverrides;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAttributeOverrideContainer_AttributeOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAttributeOverride> getAttributeOverrides()
-	{
-		if (attributeOverrides == null)
-		{
-			attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES);
-		}
-		return attributeOverrides;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fetch Groups</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fetch Groups</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlFetchGroupContainer_2_1_FetchGroups()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlFetchGroup> getFetchGroups()
-	{
-		if (fetchGroups == null)
-		{
-			fetchGroups = new EObjectContainmentEList<XmlFetchGroup>(XmlFetchGroup.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS);
-		}
-		return fetchGroups;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sequence Generator</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sequence Generator</em>' containment reference.
-	 * @see #setSequenceGenerator(XmlSequenceGenerator)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer_SequenceGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlSequenceGenerator getSequenceGenerator()
-	{
-		return sequenceGenerator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSequenceGenerator(XmlSequenceGenerator newSequenceGenerator, NotificationChain msgs)
-	{
-		XmlSequenceGenerator oldSequenceGenerator = sequenceGenerator;
-		sequenceGenerator = newSequenceGenerator;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR, oldSequenceGenerator, newSequenceGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getSequenceGenerator <em>Sequence Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sequence Generator</em>' containment reference.
-	 * @see #getSequenceGenerator()
-	 * @generated
-	 */
-	public void setSequenceGenerator(XmlSequenceGenerator newSequenceGenerator)
-	{
-		if (newSequenceGenerator != sequenceGenerator)
-		{
-			NotificationChain msgs = null;
-			if (sequenceGenerator != null)
-				msgs = ((InternalEObject)sequenceGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR, null, msgs);
-			if (newSequenceGenerator != null)
-				msgs = ((InternalEObject)newSequenceGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR, null, msgs);
-			msgs = basicSetSequenceGenerator(newSequenceGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR, newSequenceGenerator, newSequenceGenerator));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table Generator</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table Generator</em>' containment reference.
-	 * @see #setTableGenerator(XmlTableGenerator)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlGeneratorContainer_TableGenerator()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTableGenerator getTableGenerator()
-	{
-		return tableGenerator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTableGenerator(XmlTableGenerator newTableGenerator, NotificationChain msgs)
-	{
-		XmlTableGenerator oldTableGenerator = tableGenerator;
-		tableGenerator = newTableGenerator;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR, oldTableGenerator, newTableGenerator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getTableGenerator <em>Table Generator</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table Generator</em>' containment reference.
-	 * @see #getTableGenerator()
-	 * @generated
-	 */
-	public void setTableGenerator(XmlTableGenerator newTableGenerator)
-	{
-		if (newTableGenerator != tableGenerator)
-		{
-			NotificationChain msgs = null;
-			if (tableGenerator != null)
-				msgs = ((InternalEObject)tableGenerator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR, null, msgs);
-			if (newTableGenerator != null)
-				msgs = ((InternalEObject)newTableGenerator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR, null, msgs);
-			msgs = basicSetTableGenerator(newTableGenerator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR, newTableGenerator, newTableGenerator));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedQuery> getNamedQueries()
-	{
-		if (namedQueries == null)
-		{
-			namedQueries = new EObjectContainmentEList<XmlNamedQuery>(XmlNamedQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES);
-		}
-		return namedQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Native Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlNamedNativeQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Native Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Native Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedNativeQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedNativeQuery> getNamedNativeQueries()
-	{
-		if (namedNativeQueries == null)
-		{
-			namedNativeQueries = new EObjectContainmentEList<XmlNamedNativeQuery>(XmlNamedNativeQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES);
-		}
-		return namedNativeQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries()
-	{
-		if (namedStoredProcedureQueries == null)
-		{
-			namedStoredProcedureQueries = new EObjectContainmentEList<XmlNamedStoredProcedureQuery>(XmlNamedStoredProcedureQuery.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES);
-		}
-		return namedStoredProcedureQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sql Result Set Mappings</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_1_SqlResultSetMappings()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<SqlResultSetMapping> getSqlResultSetMappings()
-	{
-		if (sqlResultSetMappings == null)
-		{
-			sqlResultSetMappings = new EObjectContainmentEList<SqlResultSetMapping>(SqlResultSetMapping.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS);
-		}
-		return sqlResultSetMappings;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query Redirectors</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query Redirectors</em>' containment reference.
-	 * @see #setQueryRedirectors(XmlQueryRedirectors)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_1_QueryRedirectors()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlQueryRedirectors getQueryRedirectors()
-	{
-		return queryRedirectors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetQueryRedirectors(XmlQueryRedirectors newQueryRedirectors, NotificationChain msgs)
-	{
-		XmlQueryRedirectors oldQueryRedirectors = queryRedirectors;
-		queryRedirectors = newQueryRedirectors;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS, oldQueryRedirectors, newQueryRedirectors);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getQueryRedirectors <em>Query Redirectors</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query Redirectors</em>' containment reference.
-	 * @see #getQueryRedirectors()
-	 * @generated
-	 */
-	public void setQueryRedirectors(XmlQueryRedirectors newQueryRedirectors)
-	{
-		if (newQueryRedirectors != queryRedirectors)
-		{
-			NotificationChain msgs = null;
-			if (queryRedirectors != null)
-				msgs = ((InternalEObject)queryRedirectors).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS, null, msgs);
-			if (newQueryRedirectors != null)
-				msgs = ((InternalEObject)newQueryRedirectors).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS, null, msgs);
-			msgs = basicSetQueryRedirectors(newQueryRedirectors, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS, newQueryRedirectors, newQueryRedirectors));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent 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>Parent Class</em>' attribute.
-	 * @see #setParentClass(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_1_ParentClass()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getParentClass()
-	{
-		return parentClass;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getParentClass <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Class</em>' attribute.
-	 * @see #getParentClass()
-	 * @generated
-	 */
-	public void setParentClass(String newParentClass)
-	{
-		String oldParentClass = parentClass;
-		parentClass = newParentClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS, oldParentClass, parentClass));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPartitioning_2_2 getPartitioning()
-	{
-		return partitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
-	{
-		XmlPartitioning_2_2 oldPartitioning = partitioning;
-		partitioning = newPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING, oldPartitioning, newPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
-	{
-		if (newPartitioning != partitioning)
-		{
-			NotificationChain msgs = null;
-			if (partitioning != null)
-				msgs = ((InternalEObject)partitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING, null, msgs);
-			if (newPartitioning != null)
-				msgs = ((InternalEObject)newPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING, null, msgs);
-			msgs = basicSetPartitioning(newPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING, newPartitioning, newPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
-	{
-		return replicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
-	{
-		XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
-		replicationPartitioning = newReplicationPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING, oldReplicationPartitioning, newReplicationPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
-	{
-		if (newReplicationPartitioning != replicationPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (replicationPartitioning != null)
-				msgs = ((InternalEObject)replicationPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING, null, msgs);
-			if (newReplicationPartitioning != null)
-				msgs = ((InternalEObject)newReplicationPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING, null, msgs);
-			msgs = basicSetReplicationPartitioning(newReplicationPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING, newReplicationPartitioning, newReplicationPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
-	{
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
-	{
-		XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
-		roundRobinPartitioning = newRoundRobinPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING, oldRoundRobinPartitioning, newRoundRobinPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
-	{
-		if (newRoundRobinPartitioning != roundRobinPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (roundRobinPartitioning != null)
-				msgs = ((InternalEObject)roundRobinPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING, null, msgs);
-			if (newRoundRobinPartitioning != null)
-				msgs = ((InternalEObject)newRoundRobinPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING, null, msgs);
-			msgs = basicSetRoundRobinPartitioning(newRoundRobinPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING, newRoundRobinPartitioning, newRoundRobinPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
-	{
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
-	{
-		XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
-		pinnedPartitioning = newPinnedPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING, oldPinnedPartitioning, newPinnedPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
-	{
-		if (newPinnedPartitioning != pinnedPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (pinnedPartitioning != null)
-				msgs = ((InternalEObject)pinnedPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING, null, msgs);
-			if (newPinnedPartitioning != null)
-				msgs = ((InternalEObject)newPinnedPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING, null, msgs);
-			msgs = basicSetPinnedPartitioning(newPinnedPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING, newPinnedPartitioning, newPinnedPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRangePartitioning_2_2 getRangePartitioning()
-	{
-		return rangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
-	{
-		XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
-		rangePartitioning = newRangePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING, oldRangePartitioning, newRangePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
-	{
-		if (newRangePartitioning != rangePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (rangePartitioning != null)
-				msgs = ((InternalEObject)rangePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING, null, msgs);
-			if (newRangePartitioning != null)
-				msgs = ((InternalEObject)newRangePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING, null, msgs);
-			msgs = basicSetRangePartitioning(newRangePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING, newRangePartitioning, newRangePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlValuePartitioning_2_2 getValuePartitioning()
-	{
-		return valuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
-	{
-		XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
-		valuePartitioning = newValuePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING, oldValuePartitioning, newValuePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
-	{
-		if (newValuePartitioning != valuePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (valuePartitioning != null)
-				msgs = ((InternalEObject)valuePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING, null, msgs);
-			if (newValuePartitioning != null)
-				msgs = ((InternalEObject)newValuePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING, null, msgs);
-			msgs = basicSetValuePartitioning(newValuePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING, newValuePartitioning, newValuePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlHashPartitioning_2_2 getHashPartitioning()
-	{
-		return hashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
-	{
-		XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
-		hashPartitioning = newHashPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING, oldHashPartitioning, newHashPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
-	{
-		if (newHashPartitioning != hashPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (hashPartitioning != null)
-				msgs = ((InternalEObject)hashPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING, null, msgs);
-			if (newHashPartitioning != null)
-				msgs = ((InternalEObject)newHashPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING, null, msgs);
-			msgs = basicSetHashPartitioning(newHashPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING, newHashPartitioning, newHashPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlUnionPartitioning_2_2 getUnionPartitioning()
-	{
-		return unionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
-	{
-		XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
-		unionPartitioning = newUnionPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING, oldUnionPartitioning, newUnionPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
-	{
-		if (newUnionPartitioning != unionPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (unionPartitioning != null)
-				msgs = ((InternalEObject)unionPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING, null, msgs);
-			if (newUnionPartitioning != null)
-				msgs = ((InternalEObject)newUnionPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING, null, msgs);
-			msgs = basicSetUnionPartitioning(newUnionPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING, newUnionPartitioning, newUnionPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPartitioned()
-	{
-		return partitioned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	public void setPartitioned(String newPartitioned)
-	{
-		String oldPartitioned = partitioned;
-		partitioned = newPartitioned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED, oldPartitioned, partitioned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Additional Criteria</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additional Criteria</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>Additional Criteria</em>' containment reference.
-	 * @see #setAdditionalCriteria(XmlAdditionalCriteria_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_2_AdditionalCriteria()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAdditionalCriteria_2_2 getAdditionalCriteria()
-	{
-		return additionalCriteria;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAdditionalCriteria(XmlAdditionalCriteria_2_2 newAdditionalCriteria, NotificationChain msgs)
-	{
-		XmlAdditionalCriteria_2_2 oldAdditionalCriteria = additionalCriteria;
-		additionalCriteria = newAdditionalCriteria;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA, oldAdditionalCriteria, newAdditionalCriteria);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getAdditionalCriteria <em>Additional Criteria</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Additional Criteria</em>' containment reference.
-	 * @see #getAdditionalCriteria()
-	 * @generated
-	 */
-	public void setAdditionalCriteria(XmlAdditionalCriteria_2_2 newAdditionalCriteria)
-	{
-		if (newAdditionalCriteria != additionalCriteria)
-		{
-			NotificationChain msgs = null;
-			if (additionalCriteria != null)
-				msgs = ((InternalEObject)additionalCriteria).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA, null, msgs);
-			if (newAdditionalCriteria != null)
-				msgs = ((InternalEObject)newAdditionalCriteria).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA, null, msgs);
-			msgs = basicSetAdditionalCriteria(newAdditionalCriteria, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA, newAdditionalCriteria, newAdditionalCriteria));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Multitenant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multitenant</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>Multitenant</em>' containment reference.
-	 * @see #setMultitenant(XmlMultitenant_2_3)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_3_Multitenant()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlMultitenant_2_3 getMultitenant()
-	{
-		return multitenant;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMultitenant(XmlMultitenant_2_3 newMultitenant, NotificationChain msgs)
-	{
-		XmlMultitenant_2_3 oldMultitenant = multitenant;
-		multitenant = newMultitenant;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT, oldMultitenant, newMultitenant);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getMultitenant <em>Multitenant</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multitenant</em>' containment reference.
-	 * @see #getMultitenant()
-	 * @generated
-	 */
-	public void setMultitenant(XmlMultitenant_2_3 newMultitenant)
-	{
-		if (newMultitenant != multitenant)
-		{
-			NotificationChain msgs = null;
-			if (multitenant != null)
-				msgs = ((InternalEObject)multitenant).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT, null, msgs);
-			if (newMultitenant != null)
-				msgs = ((InternalEObject)newMultitenant).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT, null, msgs);
-			msgs = basicSetMultitenant(newMultitenant, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT, newMultitenant, newMultitenant));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_3_NamedStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries()
-	{
-		if (namedStoredFunctionQueries == null)
-		{
-			namedStoredFunctionQueries = new EObjectContainmentEList<XmlNamedStoredFunctionQuery_2_3>(XmlNamedStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES);
-		}
-		return namedStoredFunctionQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_3_NamedPlsqlStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries()
-	{
-		if (namedPlsqlStoredFunctionQueries == null)
-		{
-			namedPlsqlStoredFunctionQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredFunctionQuery_2_3>(XmlNamedPlsqlStoredFunctionQuery_2_3.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
-		}
-		return namedPlsqlStoredFunctionQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_3_NamedPlsqlStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries()
-	{
-		if (namedPlsqlStoredProcedureQueries == null)
-		{
-			namedPlsqlStoredProcedureQueries = new EObjectContainmentEList<XmlNamedPlsqlStoredProcedureQuery_2_3>(XmlNamedPlsqlStoredProcedureQuery_2_3.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
-		}
-		return namedPlsqlStoredProcedureQueries;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Records</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>Plsql Records</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_3_PlsqlRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPlsqlRecord_2_3> getPlsqlRecords()
-	{
-		if (plsqlRecords == null)
-		{
-			plsqlRecords = new EObjectContainmentEList<XmlPlsqlRecord_2_3>(XmlPlsqlRecord_2_3.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS);
-		}
-		return plsqlRecords;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Tables</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>Plsql Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_3_PlsqlTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlPlsqlTable> getPlsqlTables()
-	{
-		if (plsqlTables == null)
-		{
-			plsqlTables = new EObjectContainmentEList<XmlPlsqlTable>(XmlPlsqlTable.class, this, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES);
-		}
-		return plsqlTables;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Index</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>Cache Index</em>' containment reference.
-	 * @see #setCacheIndex(XmlCacheIndex_2_4)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_2_4_CacheIndex()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlCacheIndex_2_4 getCacheIndex()
-	{
-		return cacheIndex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCacheIndex(XmlCacheIndex_2_4 newCacheIndex, NotificationChain msgs)
-	{
-		XmlCacheIndex_2_4 oldCacheIndex = cacheIndex;
-		cacheIndex = newCacheIndex;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX, oldCacheIndex, newCacheIndex);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getCacheIndex <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Index</em>' containment reference.
-	 * @see #getCacheIndex()
-	 * @generated
-	 */
-	public void setCacheIndex(XmlCacheIndex_2_4 newCacheIndex)
-	{
-		if (newCacheIndex != cacheIndex)
-		{
-			NotificationChain msgs = null;
-			if (cacheIndex != null)
-				msgs = ((InternalEObject)cacheIndex).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX, null, msgs);
-			if (newCacheIndex != null)
-				msgs = ((InternalEObject)newCacheIndex).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX, null, msgs);
-			msgs = basicSetCacheIndex(newCacheIndex, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX, newCacheIndex, newCacheIndex));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Default Mappings</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exclude Default Mappings</em>' attribute.
-	 * @see #setExcludeDefaultMappings(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMappedSuperclass_ExcludeDefaultMappings()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getExcludeDefaultMappings()
-	{
-		return excludeDefaultMappings;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass#getExcludeDefaultMappings <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Default Mappings</em>' attribute.
-	 * @see #getExcludeDefaultMappings()
-	 * @generated
-	 */
-	public void setExcludeDefaultMappings(Boolean newExcludeDefaultMappings)
-	{
-		Boolean oldExcludeDefaultMappings = excludeDefaultMappings;
-		excludeDefaultMappings = newExcludeDefaultMappings;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS, oldExcludeDefaultMappings, excludeDefaultMappings));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
-				return basicSetPrimaryKey(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
-				return basicSetCacheInterceptor(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
-				return ((InternalEList<?>)getAssociationOverrides()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
-				return ((InternalEList<?>)getAttributeOverrides()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
-				return ((InternalEList<?>)getFetchGroups()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
-				return basicSetSequenceGenerator(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
-				return basicSetTableGenerator(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
-				return ((InternalEList<?>)getNamedQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
-				return ((InternalEList<?>)getNamedNativeQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
-				return ((InternalEList<?>)getNamedStoredProcedureQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
-				return ((InternalEList<?>)getSqlResultSetMappings()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
-				return basicSetQueryRedirectors(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING:
-				return basicSetPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING:
-				return basicSetReplicationPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING:
-				return basicSetRoundRobinPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING:
-				return basicSetPinnedPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING:
-				return basicSetRangePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING:
-				return basicSetValuePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING:
-				return basicSetHashPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING:
-				return basicSetUnionPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA:
-				return basicSetAdditionalCriteria(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT:
-				return basicSetMultitenant(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES:
-				return ((InternalEList<?>)getNamedStoredFunctionQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return ((InternalEList<?>)getNamedPlsqlStoredFunctionQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return ((InternalEList<?>)getNamedPlsqlStoredProcedureQueries()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS:
-				return ((InternalEList<?>)getPlsqlRecords()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES:
-				return ((InternalEList<?>)getPlsqlTables()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX:
-				return basicSetCacheIndex(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
-				return basicSetCustomizer(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING:
-				return basicSetChangeTracking(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE:
-				return basicSetCache(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS:
-				return ((InternalEList<?>)getConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS:
-				return ((InternalEList<?>)getTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS:
-				return ((InternalEList<?>)getObjectTypeConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS:
-				return ((InternalEList<?>)getStructConverters()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
-				return basicSetOptimisticLocking(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY:
-				return basicSetCopyPolicy(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY:
-				return basicSetInstantiationCopyPolicy(null, msgs);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY:
-				return basicSetCloneCopyPolicy(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 EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
-				return getPrimaryKey();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
-				return getCacheable();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
-				return getCacheInterceptor();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
-				return getAssociationOverrides();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
-				return getAttributeOverrides();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
-				return getFetchGroups();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
-				return getSequenceGenerator();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
-				return getTableGenerator();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
-				return getNamedQueries();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
-				return getNamedNativeQueries();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
-				return getNamedStoredProcedureQueries();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
-				return getSqlResultSetMappings();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
-				return getQueryRedirectors();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS:
-				return getParentClass();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED:
-				return getPartitioned();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA:
-				return getAdditionalCriteria();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT:
-				return getMultitenant();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES:
-				return getNamedStoredFunctionQueries();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return getNamedPlsqlStoredFunctionQueries();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return getNamedPlsqlStoredProcedureQueries();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS:
-				return getPlsqlRecords();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES:
-				return getPlsqlTables();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX:
-				return getCacheIndex();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
-				return getReadOnly();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
-				return getCustomizer();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING:
-				return getChangeTracking();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE:
-				return getCache();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING:
-				return getExistenceChecking();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS:
-				return getConverters();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS:
-				return getTypeConverters();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS:
-				return getObjectTypeConverters();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS:
-				return getStructConverters();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
-				return getOptimisticLocking();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY:
-				return getCopyPolicy();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY:
-				return getInstantiationCopyPolicy();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY:
-				return getCloneCopyPolicy();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS:
-				return getExcludeDefaultMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
-				setPrimaryKey((XmlPrimaryKey)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
-				setCacheable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
-				setCacheInterceptor((XmlClassReference)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
-				getAssociationOverrides().clear();
-				getAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
-				getFetchGroups().clear();
-				getFetchGroups().addAll((Collection<? extends XmlFetchGroup>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
-				setSequenceGenerator((XmlSequenceGenerator)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
-				getNamedQueries().clear();
-				getNamedQueries().addAll((Collection<? extends XmlNamedQuery>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
-				getNamedNativeQueries().clear();
-				getNamedNativeQueries().addAll((Collection<? extends XmlNamedNativeQuery>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
-				getNamedStoredProcedureQueries().clear();
-				getNamedStoredProcedureQueries().addAll((Collection<? extends XmlNamedStoredProcedureQuery>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
-				getSqlResultSetMappings().clear();
-				getSqlResultSetMappings().addAll((Collection<? extends SqlResultSetMapping>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
-				setQueryRedirectors((XmlQueryRedirectors)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS:
-				setParentClass((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED:
-				setPartitioned((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA:
-				setAdditionalCriteria((XmlAdditionalCriteria_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT:
-				setMultitenant((XmlMultitenant_2_3)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES:
-				getNamedStoredFunctionQueries().clear();
-				getNamedStoredFunctionQueries().addAll((Collection<? extends XmlNamedStoredFunctionQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				getNamedPlsqlStoredFunctionQueries().clear();
-				getNamedPlsqlStoredFunctionQueries().addAll((Collection<? extends XmlNamedPlsqlStoredFunctionQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				getNamedPlsqlStoredProcedureQueries().clear();
-				getNamedPlsqlStoredProcedureQueries().addAll((Collection<? extends XmlNamedPlsqlStoredProcedureQuery_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS:
-				getPlsqlRecords().clear();
-				getPlsqlRecords().addAll((Collection<? extends XmlPlsqlRecord_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES:
-				getPlsqlTables().clear();
-				getPlsqlTables().addAll((Collection<? extends XmlPlsqlTable>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX:
-				setCacheIndex((XmlCacheIndex_2_4)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
-				setReadOnly((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
-				setCustomizer((XmlClassReference)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING:
-				setChangeTracking((XmlChangeTracking)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE:
-				setCache((XmlCache)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING:
-				setExistenceChecking((ExistenceType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS:
-				getConverters().clear();
-				getConverters().addAll((Collection<? extends XmlConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				getTypeConverters().addAll((Collection<? extends XmlTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				getObjectTypeConverters().addAll((Collection<? extends XmlObjectTypeConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				getStructConverters().addAll((Collection<? extends XmlStructConverter>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
-				setOptimisticLocking((XmlOptimisticLocking)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlInstantiationCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCloneCopyPolicy)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS:
-				setExcludeDefaultMappings((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
-				setPrimaryKey((XmlPrimaryKey)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
-				setCacheable(CACHEABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
-				setCacheInterceptor((XmlClassReference)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
-				getAssociationOverrides().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
-				getAttributeOverrides().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
-				getFetchGroups().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
-				setSequenceGenerator((XmlSequenceGenerator)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
-				setTableGenerator((XmlTableGenerator)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
-				getNamedQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
-				getNamedNativeQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
-				getNamedStoredProcedureQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
-				getSqlResultSetMappings().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
-				setQueryRedirectors((XmlQueryRedirectors)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS:
-				setParentClass(PARENT_CLASS_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED:
-				setPartitioned(PARTITIONED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA:
-				setAdditionalCriteria((XmlAdditionalCriteria_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT:
-				setMultitenant((XmlMultitenant_2_3)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES:
-				getNamedStoredFunctionQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				getNamedPlsqlStoredFunctionQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				getNamedPlsqlStoredProcedureQueries().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS:
-				getPlsqlRecords().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES:
-				getPlsqlTables().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX:
-				setCacheIndex((XmlCacheIndex_2_4)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
-				setReadOnly(READ_ONLY_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
-				setCustomizer((XmlClassReference)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING:
-				setChangeTracking((XmlChangeTracking)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE:
-				setCache((XmlCache)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING:
-				setExistenceChecking(EXISTENCE_CHECKING_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS:
-				getConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS:
-				getTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS:
-				getObjectTypeConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS:
-				getStructConverters().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
-				setOptimisticLocking((XmlOptimisticLocking)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY:
-				setCopyPolicy((XmlCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY:
-				setInstantiationCopyPolicy((XmlInstantiationCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY:
-				setCloneCopyPolicy((XmlCloneCopyPolicy)null);
-				return;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS:
-				setExcludeDefaultMappings(EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY:
-				return primaryKey != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE:
-				return CACHEABLE_EDEFAULT == null ? cacheable != null : !CACHEABLE_EDEFAULT.equals(cacheable);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR:
-				return cacheInterceptor != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES:
-				return associationOverrides != null && !associationOverrides.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES:
-				return attributeOverrides != null && !attributeOverrides.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS:
-				return fetchGroups != null && !fetchGroups.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR:
-				return sequenceGenerator != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR:
-				return tableGenerator != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES:
-				return namedQueries != null && !namedQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES:
-				return namedNativeQueries != null && !namedNativeQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES:
-				return namedStoredProcedureQueries != null && !namedStoredProcedureQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS:
-				return sqlResultSetMappings != null && !sqlResultSetMappings.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS:
-				return queryRedirectors != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS:
-				return PARENT_CLASS_EDEFAULT == null ? parentClass != null : !PARENT_CLASS_EDEFAULT.equals(parentClass);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING:
-				return partitioning != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING:
-				return pinnedPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING:
-				return rangePartitioning != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING:
-				return valuePartitioning != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING:
-				return hashPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING:
-				return unionPartitioning != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED:
-				return PARTITIONED_EDEFAULT == null ? partitioned != null : !PARTITIONED_EDEFAULT.equals(partitioned);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA:
-				return additionalCriteria != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT:
-				return multitenant != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES:
-				return namedStoredFunctionQueries != null && !namedStoredFunctionQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES:
-				return namedPlsqlStoredFunctionQueries != null && !namedPlsqlStoredFunctionQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES:
-				return namedPlsqlStoredProcedureQueries != null && !namedPlsqlStoredProcedureQueries.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS:
-				return plsqlRecords != null && !plsqlRecords.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES:
-				return plsqlTables != null && !plsqlTables.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX:
-				return cacheIndex != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY:
-				return READ_ONLY_EDEFAULT == null ? readOnly != null : !READ_ONLY_EDEFAULT.equals(readOnly);
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER:
-				return customizer != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING:
-				return changeTracking != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE:
-				return cache != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING:
-				return existenceChecking != EXISTENCE_CHECKING_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS:
-				return converters != null && !converters.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS:
-				return typeConverters != null && !typeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS:
-				return objectTypeConverters != null && !objectTypeConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS:
-				return structConverters != null && !structConverters.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OPTIMISTIC_LOCKING:
-				return optimisticLocking != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__COPY_POLICY:
-				return copyPolicy != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__INSTANTIATION_COPY_POLICY:
-				return instantiationCopyPolicy != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CLONE_COPY_POLICY:
-				return cloneCopyPolicy != null;
-			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXCLUDE_DEFAULT_MAPPINGS:
-				return EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT == null ? excludeDefaultMappings != null : !EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT.equals(excludeDefaultMappings);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlMappedSuperclass_1_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY: return EclipseLinkOrmV1_1Package.XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCacheable_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE: return OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR: return EclipseLinkOrmV2_0Package.XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAssociationOverrideContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES: return OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER__ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeOverrideContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES: return OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER__ATTRIBUTE_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlFetchGroupContainer_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS: return EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlGeneratorContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR: return OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlQueryContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES: return OrmPackage.XML_QUERY_CONTAINER__NAMED_QUERIES;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES: return OrmPackage.XML_QUERY_CONTAINER__NAMED_NATIVE_QUERIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS: return EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS: return EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS: return EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__PARENT_CLASS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA: return EclipseLinkOrmV2_2Package.XML_MAPPED_SUPERCLASS_22__ADDITIONAL_CRITERIA;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT: return EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__MULTITENANT;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__NAMED_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS: return EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__PLSQL_RECORDS;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES: return EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__PLSQL_TABLES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_4.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX: return EclipseLinkOrmV2_4Package.XML_MAPPED_SUPERCLASS_24__CACHE_INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlReadOnly.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY: return EclipseLinkOrmPackage.XML_READ_ONLY__READ_ONLY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCustomizerHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER: return EclipseLinkOrmPackage.XML_CUSTOMIZER_HOLDER__CUSTOMIZER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlChangeTrackingHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING: return EclipseLinkOrmPackage.XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCacheHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE: return EclipseLinkOrmPackage.XML_CACHE_HOLDER__CACHE;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING: return EclipseLinkOrmPackage.XML_CACHE_HOLDER__EXISTENCE_CHECKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__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 == XmlMappedSuperclass_1_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV1_1Package.XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PRIMARY_KEY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCacheable_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INTERCEPTOR;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAssociationOverrideContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER__ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeOverrideContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER__ATTRIBUTE_OVERRIDES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ATTRIBUTE_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlFetchGroupContainer_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__FETCH_GROUPS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlGeneratorContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SEQUENCE_GENERATOR;
-				case OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TABLE_GENERATOR;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlQueryContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case OrmPackage.XML_QUERY_CONTAINER__NAMED_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_QUERIES;
-				case OrmPackage.XML_QUERY_CONTAINER__NAMED_NATIVE_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_NATIVE_QUERIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_QUERY_CONTAINER__NAMED_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_PROCEDURE_QUERIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__SQL_RESULT_SET_MAPPINGS;
-				case EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__QUERY_REDIRECTORS;
-				case EclipseLinkOrmV2_1Package.XML_MAPPED_SUPERCLASS_21__PARENT_CLASS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARENT_CLASS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__UNION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_MAPPED_SUPERCLASS_22__ADDITIONAL_CRITERIA: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__ADDITIONAL_CRITERIA;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__MULTITENANT: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__MULTITENANT;
-				case EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__NAMED_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_FUNCTION_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__NAMED_PLSQL_STORED_PROCEDURE_QUERIES;
-				case EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__PLSQL_RECORDS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_RECORDS;
-				case EclipseLinkOrmV2_3Package.XML_MAPPED_SUPERCLASS_23__PLSQL_TABLES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PLSQL_TABLES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMappedSuperclass_2_4.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_4Package.XML_MAPPED_SUPERCLASS_24__CACHE_INDEX: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE_INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlReadOnly.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_READ_ONLY__READ_ONLY: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__READ_ONLY;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCustomizerHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CUSTOMIZER_HOLDER__CUSTOMIZER: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CUSTOMIZER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlChangeTrackingHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CHANGE_TRACKING_HOLDER__CHANGE_TRACKING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CHANGE_TRACKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCacheHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CACHE_HOLDER__CACHE: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHE;
-				case EclipseLinkOrmPackage.XML_CACHE_HOLDER__EXISTENCE_CHECKING: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__EXISTENCE_CHECKING;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertersHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__OBJECT_TYPE_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__OBJECT_TYPE_CONVERTERS;
-				case EclipseLinkOrmPackage.XML_CONVERTERS_HOLDER__STRUCT_CONVERTERS: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__STRUCT_CONVERTERS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__PROPERTIES;
-				default: return -1;
-			}
-		}
-		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(" (cacheable: ");
-		result.append(cacheable);
-		result.append(", parentClass: ");
-		result.append(parentClass);
-		result.append(", partitioned: ");
-		result.append(partitioned);
-		result.append(", readOnly: ");
-		result.append(readOnly);
-		result.append(", existenceChecking: ");
-		result.append(existenceChecking);
-		result.append(", excludeDefaultMappings: ");
-		result.append(excludeDefaultMappings);
-		result.append(')');
-		return result.toString();
-	}
-
-	public TextRange getReadOnlyTextRange() {
-		return getAttributeTextRange(EclipseLink.READ_ONLY);
-	}
-	
-	public TextRange getCacheableTextRange() {
-		return getAttributeTextRange(JPA2_0.CACHEABLE);
-	}
-	
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlMappedSuperclass(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildClassTranslator(),
-			buildParentClassTranslator(),
-			buildAccessTranslator(),
-			buildCacheableTranslator(),
-			buildMetadataCompleteTranslator(),
-			buildReadOnlyTranslator(),
-			buildExistenceCheckingTranslator(),
-			buildExcludeDefaultMappingsTranslator(),
-			buildDescriptionTranslator(),
-			buildAccessMethodsTranslator(),
-		    XmlMultitenant.buildTranslator(EclipseLink2_3.MULTITENANT, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlMappedSuperclass_2_3_Multitenant()),
-		    buildAdditionalCriteriaTranslator(),
-			buildCustomizerTranslator(),
-			buildChangeTrackingTranslator(),
-			buildIdClassTranslator(),
-			buildPrimaryKeyTranslator(),
-			buildOptimisticLockingTranslator(),
-			buildCacheTranslator(),
-			buildCacheInterceptorTranslator(),
-			buildCacheIndexTranslator(),
-			buildFetchGroupsTranslator(),
-			buildConverterTranslator(),
-			buildTypeConverterTranslator(),
-			buildObjectTypeConverterTranslator(),
-			buildStructConverterTranslator(),
-			buildCopyPolicyTranslator(),
-			buildInstantiationCoypPolicyTranslator(),
-			buildCloneCopyPolicyTranslator(),
-			buildSequenceGeneratorTranslator(),
-			buildTableGeneratorTranslator(),
-			buildNamedQueryTranslator(),
-			buildNamedNativeQueryTranslator(),
-			buildNamedStoredProcedureQueryTranslator(),
-			XmlNamedStoredFunctionQuery.buildTranslator(EclipseLink2_3.NAMED_STORED_FUNCTION_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlMappedSuperclass_2_3_NamedStoredFunctionQueries()),
-			XmlNamedPlsqlStoredProcedureQuery.buildTranslator(EclipseLink2_3.NAMED_PLSQL_STORED_PROCEDURE_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlMappedSuperclass_2_3_NamedPlsqlStoredProcedureQueries()),
-			XmlNamedPlsqlStoredFunctionQuery.buildTranslator(EclipseLink2_3.NAMED_PLSQL_STORED_FUNCTION_QUERY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlMappedSuperclass_2_3_NamedPlsqlStoredFunctionQueries()),
-			XmlPlsqlRecord.buildTranslator(EclipseLink2_3.PLSQL_RECORD, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlMappedSuperclass_2_3_PlsqlRecords()),
-			XmlPlsqlTable.buildTranslator(EclipseLink2_3.PLSQL_TABLE, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlMappedSuperclass_2_3_PlsqlTables()),
-			buildSqlResultSetMappingTranslator(),
-			buildQueryRedirectorsTranslator(),
-			buildExcludeDefaultListenersTranslator(),
-			buildExcludeSuperclassListenersTranslator(),
-			buildEntityListenersTranslator(),
-			buildPrePersistTranslator(),
-			buildPostPersistTranslator(),
-			buildPreRemoveTranslator(),
-			buildPostRemoveTranslator(),
-			buildPreUpdateTranslator(),
-			buildPostUpdateTranslator(),
-			buildPostLoadTranslator(),
-			buildPropertyTranslator(),
-			buildAttributeOverrideTranslator(),
-			buildAssociationOverrideTranslator(),
-			Attributes.buildTranslator()};
-	}
-	
-	protected static Translator buildCacheableTranslator() {
-		return new Translator(JPA2_0.CACHEABLE, OrmV2_0Package.eINSTANCE.getXmlCacheable_2_0_Cacheable(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildReadOnlyTranslator() {
-		return new Translator(EclipseLink.READ_ONLY, EclipseLinkOrmPackage.eINSTANCE.getXmlReadOnly_ReadOnly(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildExistenceCheckingTranslator() {
-		return new Translator(EclipseLink.EXISTENCE_CHECKING, EclipseLinkOrmPackage.eINSTANCE.getXmlCacheHolder_ExistenceChecking(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildExcludeDefaultMappingsTranslator() {
-		return new Translator(EclipseLink.EXCLUDE_DEFAULT_MAPPINGS, EclipseLinkOrmPackage.eINSTANCE.getXmlMappedSuperclass_ExcludeDefaultMappings(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildCustomizerTranslator() {
-		return XmlClassReference.buildTranslator(EclipseLink.CUSTOMIZER, EclipseLinkOrmPackage.eINSTANCE.getXmlCustomizerHolder_Customizer());
-	}
-	
-	protected static Translator buildChangeTrackingTranslator() {
-		return XmlChangeTracking.buildTranslator(EclipseLink.CHANGE_TRACKING, EclipseLinkOrmPackage.eINSTANCE.getXmlChangeTrackingHolder_ChangeTracking());
-	}
-	
-	protected static Translator buildPrimaryKeyTranslator() {
-		return XmlPrimaryKey.buildTranslator(EclipseLink1_1.PRIMARY_KEY, EclipseLinkOrmV1_1Package.eINSTANCE.getXmlMappedSuperclass_1_1_PrimaryKey());
-	}
-	
-	protected static Translator buildOptimisticLockingTranslator() {
-		return XmlOptimisticLocking.buildTranslator(EclipseLink.OPTIMISTIC_LOCKING, EclipseLinkOrmPackage.eINSTANCE.getXmlMappedSuperclass_OptimisticLocking());
-	}
-	
-	protected static Translator buildCacheTranslator() {
-		return XmlCache.buildTranslator(EclipseLink.CACHE, EclipseLinkOrmPackage.eINSTANCE.getXmlCacheHolder_Cache());
-	}
-	
-	protected static Translator buildCacheInterceptorTranslator() {
-		return XmlClassReference.buildTranslator(EclipseLink2_0.CACHE_INTERCEPTOR, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMappedSuperclass_2_0_CacheInterceptor());
-	}
-
-	protected static Translator buildCacheIndexTranslator() {
-		return XmlCacheIndex.buildTranslator(EclipseLink2_4.CACHE_INDEX, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlMappedSuperclass_2_4_CacheIndex());
-	}
-
-	protected static Translator buildFetchGroupsTranslator() {
-		return XmlFetchGroup.buildTranslator(EclipseLink2_1.FETCH_GROUP, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlFetchGroupContainer_2_1_FetchGroups());
-	}
-	
-	protected static Translator buildConverterTranslator() {
-		return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_Converters());
-	}
-	
-	protected static Translator buildTypeConverterTranslator() {
-		return XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_TypeConverters());
-	}
-	
-	protected static Translator buildObjectTypeConverterTranslator() {
-		return XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_ObjectTypeConverters());
-	}
-	
-	protected static Translator buildStructConverterTranslator() {
-		return XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertersHolder_StructConverters());
-	}
-	
-	protected static Translator buildCopyPolicyTranslator() {
-		return XmlCopyPolicy.buildTranslator(EclipseLink.COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlMappedSuperclass_CopyPolicy());
-	}
-	
-	protected static Translator buildInstantiationCoypPolicyTranslator() {
-		return XmlInstantiationCopyPolicy.buildTranslator(EclipseLink.INSTANTIATION_COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlMappedSuperclass_InstantiationCopyPolicy());
-	}
-	
-	protected static Translator buildCloneCopyPolicyTranslator() {
-		return XmlCloneCopyPolicy.buildTranslator(EclipseLink.CLONE_COPY_POLICY, EclipseLinkOrmPackage.eINSTANCE.getXmlMappedSuperclass_CloneCopyPolicy());
-	}
-	
-	protected static Translator buildSequenceGeneratorTranslator() {
-		return XmlSequenceGenerator.buildTranslator(JPA.SEQUENCE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_SequenceGenerator());
-	}
-	
-	protected static Translator buildTableGeneratorTranslator() {
-		return org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator.buildTranslator(JPA.TABLE_GENERATOR, OrmPackage.eINSTANCE.getXmlGeneratorContainer_TableGenerator());
-	}
-	
-	protected static Translator buildNamedQueryTranslator() {
-		return XmlNamedQuery.buildTranslator(JPA.NAMED_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedQueries());
-	}
-	
-	protected static Translator buildNamedNativeQueryTranslator() {
-		return XmlNamedNativeQuery.buildTranslator(JPA.NAMED_NATIVE_QUERY, OrmPackage.eINSTANCE.getXmlQueryContainer_NamedNativeQueries());
-	}
-	
-	protected static Translator buildNamedStoredProcedureQueryTranslator() {
-		return XmlNamedStoredProcedureQuery.buildTranslator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY, EclipseLinkOrmPackage.eINSTANCE.getXmlQueryContainer_NamedStoredProcedureQueries());
-	}
-	
-	protected static Translator buildSqlResultSetMappingTranslator() {
-		return SqlResultSetMapping.buildTranslator(JPA.SQL_RESULT_SET_MAPPING, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlMappedSuperclass_2_1_SqlResultSetMappings());
-	}
-	
-	protected static Translator buildQueryRedirectorsTranslator() {
-		return XmlQueryRedirectors.buildTranslator(EclipseLink2_0.QUERY_REDIRECTORS, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlMappedSuperclass_2_1_QueryRedirectors());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-		
-	protected static Translator buildAttributeOverrideTranslator() {
-		return XmlAttributeOverride.buildTranslator(JPA.ATTRIBUTE_OVERRIDE, OrmPackage.eINSTANCE.getXmlAttributeOverrideContainer_AttributeOverrides());
-	}
-	
-	protected static Translator buildAssociationOverrideTranslator() {
-		return XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, OrmPackage.eINSTANCE.getXmlAssociationOverrideContainer_AssociationOverrides());
-	}
-
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildParentClassTranslator() {
-		return new Translator(EclipseLink2_1.PARENT_CLASS, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlMappedSuperclass_2_1_ParentClass(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildAdditionalCriteriaTranslator() {
-		return XmlAdditionalCriteria.buildTranslator(EclipseLink2_2.ADDITIONAL_CRITERIA, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlMappedSuperclass_2_2_AdditionalCriteria());
-	}
-}
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
deleted file mode 100644
index 845126d9ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMultitenant.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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;
-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.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Multitenant</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant()
- * @model kind="class"
- * @generated
- */
-public class XmlMultitenant extends AbstractJpaEObject implements XmlMultitenant_2_3, XmlMultitenant_2_4
-{
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final MultitenantType 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 MultitenantType type = TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTenantDiscriminatorColumns() <em>Tenant Discriminator Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTenantDiscriminatorColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns;
-
-	/**
-	 * The default value of the '{@link #getIncludeCriteria() <em>Include Criteria</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludeCriteria()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean INCLUDE_CRITERIA_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getIncludeCriteria() <em>Include Criteria</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludeCriteria()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean includeCriteria = INCLUDE_CRITERIA_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlMultitenant()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_MULTITENANT;
-	}
-	
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType}.
-	 * <!-- 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 org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType
-	 * @see #setType(MultitenantType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant_2_3_Type()
-	 * @model
-	 * @generated
-	 */
-	public MultitenantType getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType
-	 * @see #getType()
-	 * @generated
-	 */
-	public void setType(MultitenantType newType)
-	{
-		MultitenantType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MULTITENANT__TYPE, oldType, type));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant_2_3_TenantDiscriminatorColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns()
-	{
-		if (tenantDiscriminatorColumns == null)
-		{
-			tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS);
-		}
-		return tenantDiscriminatorColumns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Include Criteria</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Include Criteria</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Include Criteria</em>' attribute.
-	 * @see #setIncludeCriteria(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMultitenant_2_4_IncludeCriteria()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getIncludeCriteria()
-	{
-		return includeCriteria;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMultitenant#getIncludeCriteria <em>Include Criteria</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Include Criteria</em>' attribute.
-	 * @see #getIncludeCriteria()
-	 * @generated
-	 */
-	public void setIncludeCriteria(Boolean newIncludeCriteria)
-	{
-		Boolean oldIncludeCriteria = includeCriteria;
-		includeCriteria = newIncludeCriteria;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA, oldIncludeCriteria, includeCriteria));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS:
-				return ((InternalEList<?>)getTenantDiscriminatorColumns()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TYPE:
-				return getType();
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS:
-				return getTenantDiscriminatorColumns();
-			case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA:
-				return getIncludeCriteria();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TYPE:
-				setType((MultitenantType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS:
-				getTenantDiscriminatorColumns().clear();
-				getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA:
-				setIncludeCriteria((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS:
-				getTenantDiscriminatorColumns().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA:
-				setIncludeCriteria(INCLUDE_CRITERIA_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TYPE:
-				return type != TYPE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_MULTITENANT__TENANT_DISCRIMINATOR_COLUMNS:
-				return tenantDiscriminatorColumns != null && !tenantDiscriminatorColumns.isEmpty();
-			case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA:
-				return INCLUDE_CRITERIA_EDEFAULT == null ? includeCriteria != null : !INCLUDE_CRITERIA_EDEFAULT.equals(includeCriteria);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlMultitenant_2_4.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA: return EclipseLinkOrmV2_4Package.XML_MULTITENANT_24__INCLUDE_CRITERIA;
-				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 == XmlMultitenant_2_4.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_4Package.XML_MULTITENANT_24__INCLUDE_CRITERIA: return EclipseLinkOrmPackage.XML_MULTITENANT__INCLUDE_CRITERIA;
-				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(" (type: ");
-		result.append(type);
-		result.append(", includeCriteria: ");
-		result.append(includeCriteria);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlMultitenant(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildTypeTranslator(),
-			buildIncludeCriteriaTranslator(),
-			buildTenantDiscriminatorColumnsTranslator()
-		};
-	}
-
-	protected static Translator buildTypeTranslator() {
-		return new Translator(EclipseLink2_3.MULTITENANT__TYPE, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlMultitenant_2_3_Type());
-	}
-
-	protected static Translator buildTenantDiscriminatorColumnsTranslator() {
-		return XmlTenantDiscriminatorColumn.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlMultitenant_2_3_TenantDiscriminatorColumns());		
-	}
-	
-	protected static Translator buildIncludeCriteriaTranslator() {
-		return new Translator(EclipseLink2_4.MULTITENANT__INCLUDE_CRITERIA, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlMultitenant_2_4_IncludeCriteria(), Translator.DOM_ATTRIBUTE);
-	}
-
-} // XmlMultitenant
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
deleted file mode 100644
index 8d79dbdb82..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlMutable.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Mutable</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable#getMutable <em>Mutable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlMutable extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mutable</em>' attribute.
-	 * @see #setMutable(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable_Mutable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getMutable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMutable#getMutable <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mutable</em>' attribute.
-	 * @see #getMutable()
-	 * @generated
-	 */
-	void setMutable(Boolean value);
-	
-	/**
-	 * Return the {@link TextRange} for the mutable attibute.
-	 */
-	TextRange getMutableTextRange();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java
deleted file mode 100644
index 04602b05dc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedConverter.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Named Converter</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlNamedConverter extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlNamedConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_NAMED_CONVERTER;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedConverter_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedConverter#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_CONVERTER__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_CONVERTER__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_CONVERTER__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_CONVERTER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_CONVERTER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getNameTextRange() {
-		return getAttributeTextRange(JPA.NAME);
-	}
-	
-	// ********** translators **********
-	
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink.CONVERTER__NAME, EclipseLinkOrmPackage.eINSTANCE.getXmlNamedConverter_Name(), Translator.DOM_ATTRIBUTE);
-	}
-
-} // XmlNamedConverter
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
deleted file mode 100644
index d408d33c2a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredFunctionQuery.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Named Plsql Stored Function Query</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredFunctionQuery()
- * @model kind="class"
- * @generated
- */
-public class XmlNamedPlsqlStoredFunctionQuery extends AbstractJpaEObject implements XmlNamedPlsqlStoredFunctionQuery_2_3
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlNamedPlsqlStoredFunctionQuery()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY;
-	}
-	
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredFunctionQuery_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredFunctionQuery#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlNamedPlsqlStoredFunctionQuery(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink2_3.NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlNamedPlsqlStoredFunctionQuery_2_3_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlNamedPlsqlStoredFunctionQuery
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
deleted file mode 100644
index 50af5ce82d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedPlsqlStoredProcedureQuery.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Named Plsql Stored Procedure Query</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredProcedureQuery()
- * @model kind="class"
- * @generated
- */
-public class XmlNamedPlsqlStoredProcedureQuery extends AbstractJpaEObject implements XmlNamedPlsqlStoredProcedureQuery_2_3
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlNamedPlsqlStoredProcedureQuery()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY;
-	}
-	
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedPlsqlStoredProcedureQuery_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedPlsqlStoredProcedureQuery#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlNamedPlsqlStoredProcedureQuery(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink2_3.NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlNamedPlsqlStoredProcedureQuery_2_3_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlNamedPlsqlStoredProcedureQuery
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
deleted file mode 100644
index 771ec817ce..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredFunctionQuery.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Named Stored Function Query</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredFunctionQuery()
- * @model kind="class"
- * @generated
- */
-public class XmlNamedStoredFunctionQuery extends AbstractJpaEObject implements XmlNamedStoredFunctionQuery_2_3
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlNamedStoredFunctionQuery()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_NAMED_STORED_FUNCTION_QUERY;
-	}
-	
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredFunctionQuery_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredFunctionQuery#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_STORED_FUNCTION_QUERY__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_FUNCTION_QUERY__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_FUNCTION_QUERY__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_FUNCTION_QUERY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_FUNCTION_QUERY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlNamedStoredFunctionQuery(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink2_3.NAMED_STORED_FUNCTION_QUERY__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlNamedStoredFunctionQuery_2_3_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlNamedStoredFunctionQuery
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
deleted file mode 100644
index 12be339a21..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNamedStoredProcedureQuery.java
+++ /dev/null
@@ -1,644 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.BooleanTranslator;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Named Stored Procedure Query</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.2
- * @since 2.2
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultClass <em>Result Class</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultSetMapping <em>Result Set Mapping</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getProcedureName <em>Procedure Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getReturnsResultSet <em>Returns Result Set</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getHints <em>Hints</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getParameters <em>Parameters</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlNamedStoredProcedureQuery extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * 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 #getResultClass() <em>Result Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResultClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RESULT_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResultClass() <em>Result Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResultClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String resultClass = RESULT_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getResultSetMapping() <em>Result Set Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResultSetMapping()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RESULT_SET_MAPPING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResultSetMapping() <em>Result Set Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResultSetMapping()
-	 * @generated
-	 * @ordered
-	 */
-	protected String resultSetMapping = RESULT_SET_MAPPING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getProcedureName() <em>Procedure Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProcedureName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PROCEDURE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getProcedureName() <em>Procedure Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProcedureName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String procedureName = PROCEDURE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getReturnsResultSet() <em>Returns Result Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnsResultSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean RETURNS_RESULT_SET_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReturnsResultSet() <em>Returns Result Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnsResultSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean returnsResultSet = RETURNS_RESULT_SET_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getHints() <em>Hints</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHints()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlQueryHint> hints;
-
-	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlStoredProcedureParameter> parameters;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlNamedStoredProcedureQuery()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_NAMED_STORED_PROCEDURE_QUERY;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Result Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Result 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>Result Class</em>' attribute.
-	 * @see #setResultClass(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery_ResultClass()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getResultClass()
-	{
-		return resultClass;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultClass <em>Result Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Result Class</em>' attribute.
-	 * @see #getResultClass()
-	 * @generated
-	 */
-	public void setResultClass(String newResultClass)
-	{
-		String oldResultClass = resultClass;
-		resultClass = newResultClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS, oldResultClass, resultClass));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Result Set Mapping</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Result Set Mapping</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Result Set Mapping</em>' attribute.
-	 * @see #setResultSetMapping(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery_ResultSetMapping()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getResultSetMapping()
-	{
-		return resultSetMapping;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getResultSetMapping <em>Result Set Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Result Set Mapping</em>' attribute.
-	 * @see #getResultSetMapping()
-	 * @generated
-	 */
-	public void setResultSetMapping(String newResultSetMapping)
-	{
-		String oldResultSetMapping = resultSetMapping;
-		resultSetMapping = newResultSetMapping;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING, oldResultSetMapping, resultSetMapping));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Procedure Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Procedure 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>Procedure Name</em>' attribute.
-	 * @see #setProcedureName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery_ProcedureName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getProcedureName()
-	{
-		return procedureName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getProcedureName <em>Procedure Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Procedure Name</em>' attribute.
-	 * @see #getProcedureName()
-	 * @generated
-	 */
-	public void setProcedureName(String newProcedureName)
-	{
-		String oldProcedureName = procedureName;
-		procedureName = newProcedureName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME, oldProcedureName, procedureName));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Returns Result Set</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Returns Result Set</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Returns Result Set</em>' attribute.
-	 * @see #setReturnsResultSet(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery_ReturnsResultSet()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getReturnsResultSet()
-	{
-		return returnsResultSet;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery#getReturnsResultSet <em>Returns Result Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Returns Result Set</em>' attribute.
-	 * @see #getReturnsResultSet()
-	 * @generated
-	 */
-	public void setReturnsResultSet(Boolean newReturnsResultSet)
-	{
-		Boolean oldReturnsResultSet = returnsResultSet;
-		returnsResultSet = newReturnsResultSet;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET, oldReturnsResultSet, returnsResultSet));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hints</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlQueryHint}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hints</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>Hints</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery_Hints()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlQueryHint> getHints()
-	{
-		if (hints == null)
-		{
-			hints = new EObjectContainmentEList<XmlQueryHint>(XmlQueryHint.class, this, EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS);
-		}
-		return hints;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Parameters</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlNamedStoredProcedureQuery_Parameters()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlStoredProcedureParameter> getParameters()
-	{
-		if (parameters == null)
-		{
-			parameters = new EObjectContainmentEList<XmlStoredProcedureParameter>(XmlStoredProcedureParameter.class, this, EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS);
-		}
-		return parameters;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
-				return ((InternalEList<?>)getHints()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
-				return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS:
-				return getResultClass();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING:
-				return getResultSetMapping();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME:
-				return getProcedureName();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET:
-				return getReturnsResultSet();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
-				return getHints();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
-				return getParameters();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS:
-				setResultClass((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING:
-				setResultSetMapping((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME:
-				setProcedureName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET:
-				setReturnsResultSet((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
-				getHints().clear();
-				getHints().addAll((Collection<? extends XmlQueryHint>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
-				getParameters().clear();
-				getParameters().addAll((Collection<? extends XmlStoredProcedureParameter>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS:
-				setResultClass(RESULT_CLASS_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING:
-				setResultSetMapping(RESULT_SET_MAPPING_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME:
-				setProcedureName(PROCEDURE_NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET:
-				setReturnsResultSet(RETURNS_RESULT_SET_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
-				getHints().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
-				getParameters().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS:
-				return RESULT_CLASS_EDEFAULT == null ? resultClass != null : !RESULT_CLASS_EDEFAULT.equals(resultClass);
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING:
-				return RESULT_SET_MAPPING_EDEFAULT == null ? resultSetMapping != null : !RESULT_SET_MAPPING_EDEFAULT.equals(resultSetMapping);
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME:
-				return PROCEDURE_NAME_EDEFAULT == null ? procedureName != null : !PROCEDURE_NAME_EDEFAULT.equals(procedureName);
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET:
-				return RETURNS_RESULT_SET_EDEFAULT == null ? returnsResultSet != null : !RETURNS_RESULT_SET_EDEFAULT.equals(returnsResultSet);
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__HINTS:
-				return hints != null && !hints.isEmpty();
-			case EclipseLinkOrmPackage.XML_NAMED_STORED_PROCEDURE_QUERY__PARAMETERS:
-				return parameters != null && !parameters.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(", resultClass: ");
-		result.append(resultClass);
-		result.append(", resultSetMapping: ");
-		result.append(resultSetMapping);
-		result.append(", procedureName: ");
-		result.append(procedureName);
-		result.append(", returnsResultSet: ");
-		result.append(returnsResultSet);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildResultClassTranslator(),
-			buildResultSetMappingTranslator(),
-			buildProcedureNameTranslator(),
-			buildReturnResultSetTranslator(),
-			buildHintTranslator(),
-			buildParameterTranslator(),
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY__NAME, EclipseLinkOrmPackage.eINSTANCE.getXmlNamedStoredProcedureQuery_Name(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildResultClassTranslator() {
-		return new Translator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY__RESULT_CLASS, EclipseLinkOrmPackage.eINSTANCE.getXmlNamedStoredProcedureQuery_ResultClass(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildResultSetMappingTranslator() {
-		return new Translator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY__RESULT_SET_MAPPING, EclipseLinkOrmPackage.eINSTANCE.getXmlNamedStoredProcedureQuery_ResultSetMapping(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildProcedureNameTranslator() {
-		return new Translator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY__PROCEDURE_NAME, EclipseLinkOrmPackage.eINSTANCE.getXmlNamedStoredProcedureQuery_ProcedureName(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildReturnResultSetTranslator() {
-		return new BooleanTranslator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY__RETURNS_RESULT_SET, EclipseLinkOrmPackage.eINSTANCE.getXmlNamedStoredProcedureQuery_ReturnsResultSet(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildHintTranslator() {
-		return XmlQueryHint.buildTranslator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY__HINT, EclipseLinkOrmPackage.eINSTANCE.getXmlNamedStoredProcedureQuery_Hints());
-	}
-	
-	protected static Translator buildParameterTranslator() {
-		return XmlStoredProcedureParameter.buildTranslator(EclipseLink.NAMED_STORED_PROCEDURE_QUERY__PARAMETER, EclipseLinkOrmPackage.eINSTANCE.getXmlNamedStoredProcedureQuery_Parameters());
-	}
-} // XmlNamedStoredProcedureQuery
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlObjectTypeConverter.java
deleted file mode 100644
index 07e6ef6e5d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlObjectTypeConverter.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.jdt.core.IType;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Object Type CustomConverter</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDataType <em>Data Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getObjectType <em>Object Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getConversionValues <em>Conversion Values</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDefaultObjectValue <em>Default Object Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
- * @model kind="class"
- * @generated
- */
-public class XmlObjectTypeConverter extends XmlNamedConverter
-{
-	/**
-	 * The default value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DATA_TYPE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dataType = DATA_TYPE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OBJECT_TYPE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String objectType = OBJECT_TYPE_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getConversionValues() <em>Conversion Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConversionValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlConversionValue> conversionValues;
-	/**
-	 * The default value of the '{@link #getDefaultObjectValue() <em>Default Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultObjectValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DEFAULT_OBJECT_VALUE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getDefaultObjectValue() <em>Default Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultObjectValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String defaultObjectValue = DEFAULT_OBJECT_VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlObjectTypeConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_OBJECT_TYPE_CONVERTER;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Data Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Data 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>Data Type</em>' attribute.
-	 * @see #setDataType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DataType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDataType()
-	{
-		return dataType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDataType <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data Type</em>' attribute.
-	 * @see #getDataType()
-	 * @generated
-	 */
-	public void setDataType(String newDataType)
-	{
-		String oldDataType = dataType;
-		dataType = newDataType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE, oldDataType, dataType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object 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>Object Type</em>' attribute.
-	 * @see #setObjectType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ObjectType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getObjectType()
-	{
-		return objectType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getObjectType <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type</em>' attribute.
-	 * @see #getObjectType()
-	 * @generated
-	 */
-	public void setObjectType(String newObjectType)
-	{
-		String oldObjectType = objectType;
-		objectType = newObjectType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE, oldObjectType, objectType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Conversion Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConversionValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Conversion 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>Conversion Values</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ConversionValues()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlConversionValue> getConversionValues()
-	{
-		if (conversionValues == null)
-		{
-			conversionValues = new EObjectContainmentEList<XmlConversionValue>(XmlConversionValue.class, this, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES);
-		}
-		return conversionValues;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Default Object Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Object 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 Object Value</em>' attribute.
-	 * @see #setDefaultObjectValue(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DefaultObjectValue()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDefaultObjectValue()
-	{
-		return defaultObjectValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDefaultObjectValue <em>Default Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Object Value</em>' attribute.
-	 * @see #getDefaultObjectValue()
-	 * @generated
-	 */
-	public void setDefaultObjectValue(String newDefaultObjectValue)
-	{
-		String oldDefaultObjectValue = defaultObjectValue;
-		defaultObjectValue = newDefaultObjectValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE, oldDefaultObjectValue, defaultObjectValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				return ((InternalEList<?>)getConversionValues()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE:
-				return getDataType();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE:
-				return getObjectType();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				return getConversionValues();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE:
-				return getDefaultObjectValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE:
-				setDataType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE:
-				setObjectType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				getConversionValues().clear();
-				getConversionValues().addAll((Collection<? extends XmlConversionValue>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE:
-				setDefaultObjectValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE:
-				setDataType(DATA_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE:
-				setObjectType(OBJECT_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				getConversionValues().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE:
-				setDefaultObjectValue(DEFAULT_OBJECT_VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE:
-				return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType);
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE:
-				return OBJECT_TYPE_EDEFAULT == null ? objectType != null : !OBJECT_TYPE_EDEFAULT.equals(objectType);
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				return conversionValues != null && !conversionValues.isEmpty();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE:
-				return DEFAULT_OBJECT_VALUE_EDEFAULT == null ? defaultObjectValue != null : !DEFAULT_OBJECT_VALUE_EDEFAULT.equals(defaultObjectValue);
-		}
-		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(" (dataType: ");
-		result.append(dataType);
-		result.append(", objectType: ");
-		result.append(objectType);
-		result.append(", defaultObjectValue: ");
-		result.append(defaultObjectValue);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildConversionValueTranslator(),
-			buildDefaultObjectValueTranslator(),
-			buildNameTranslator(),
-			buildDataTypeTranslator(),
-			buildObjectTypeTranslator(),
-		};
-	}
-	
-	protected static Translator buildConversionValueTranslator() {
-		return XmlConversionValue.buildTranslator(EclipseLink.CONVERSION_VALUE, EclipseLinkOrmPackage.eINSTANCE.getXmlObjectTypeConverter_ConversionValues());
-	}
-	
-	protected static Translator buildDefaultObjectValueTranslator() {
-		return new Translator(EclipseLink.OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE, EclipseLinkOrmPackage.eINSTANCE.getXmlObjectTypeConverter_DefaultObjectValue());
-	}
-	
-	protected static Translator buildDataTypeTranslator() {
-		return new Translator(EclipseLink.OBJECT_TYPE_CONVERTER__DATA_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlObjectTypeConverter_DataType(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildObjectTypeTranslator() {
-		return new Translator(EclipseLink.OBJECT_TYPE_CONVERTER__OBJECT_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlObjectTypeConverter_ObjectType(), Translator.DOM_ATTRIBUTE);
-	}
-
-
-	// ********** refactoring **********
-
-	public ReplaceEdit createRenameDataTypeEdit(IType originalType, String newName) {
-		String originalName = originalType.getTypeQualifiedName();
-		int nameIndex = this.dataType.lastIndexOf(originalName);
-		int offset = getAttributeNode(EclipseLink.OBJECT_TYPE_CONVERTER__DATA_TYPE).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
-	}
-
-	public ReplaceEdit createRenameDataTypePackageEdit(String newName) {
-		int packageLength = this.dataType.lastIndexOf('.');
-		if (packageLength == -1) {
-			packageLength = 0;
-			newName = newName + '.';
-		}
-		int offset = getAttributeNode(EclipseLink.OBJECT_TYPE_CONVERTER__DATA_TYPE).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset, packageLength, newName);
-	}
-
-	public ReplaceEdit createRenameObjectTypeEdit(IType originalType, String newName) {
-		String originalName = originalType.getTypeQualifiedName();
-		int nameIndex = this.objectType.lastIndexOf(originalName);
-		int offset = getAttributeNode(EclipseLink.OBJECT_TYPE_CONVERTER__OBJECT_TYPE).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
-	}
-
-	public ReplaceEdit createRenameObjectTypePackageEdit(String newName) {
-		int packageLength = this.objectType.lastIndexOf('.');
-		if (packageLength == -1) {
-			packageLength = 0;
-			newName = newName + '.';
-		}
-		int offset = getAttributeNode(EclipseLink.OBJECT_TYPE_CONVERTER__OBJECT_TYPE).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset, packageLength, newName);
-	}
-
-} // XmlObjectTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java
deleted file mode 100644
index 096efbfde7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToMany.java
+++ /dev/null
@@ -1,2361 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.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;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride;
-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.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.XmlCollectionMapping_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0;
-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.XmlOneToMany_2_1;
-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.XmlHashPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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_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.XmlOneToMany_2_4;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml One To Many</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany()
- * @model kind="class"
- * @generated
- */
-public class XmlOneToMany extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany implements XmlOneToMany_2_0, XmlOneToMany_2_1, XmlOneToMany_2_2, XmlOneToMany_2_4, XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch
-{
-	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlConverter converter;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTypeConverter typeConverter;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlObjectTypeConverter objectTypeConverter;
-
-	/**
-	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlStructConverter structConverter;
-
-	/**
-	 * The cached value of the '{@link #getMapKeyAssociationOverrides() <em>Map Key Association Overrides</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyAssociationOverrides()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlAssociationOverride> mapKeyAssociationOverrides;
-
-	/**
-	 * The default value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MAP_KEY_CONVERT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMapKeyConvert() <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String mapKeyConvert = MAP_KEY_CONVERT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBatchFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlBatchFetch batchFetch;
-
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPartitioning_2_2 partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReplicationPartitioning_2_2 replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRangePartitioning_2_2 rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlValuePartitioning_2_2 valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlHashPartitioning_2_2 hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlUnionPartitioning_2_2 unionPartitioning;
-
-	/**
-	 * The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARTITIONED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected String partitioned = PARTITIONED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CASCADE_ON_DELETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cascadeOnDelete = CASCADE_ON_DELETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNoncacheable() <em>Noncacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNoncacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NONCACHEABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNoncacheable() <em>Noncacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNoncacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean noncacheable = NONCACHEABLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDeleteAll() <em>Delete All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDeleteAll()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DELETE_ALL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDeleteAll() <em>Delete All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDeleteAll()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean deleteAll = DELETE_ALL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The default value of the '{@link #isPrivateOwned() <em>Private Owned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPrivateOwned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PRIVATE_OWNED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isPrivateOwned() <em>Private Owned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPrivateOwned()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean privateOwned = PRIVATE_OWNED_EDEFAULT;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlOneToMany()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ONE_TO_MANY;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Private Owned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Private Owned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Private Owned</em>' attribute.
-	 * @see #setPrivateOwned(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned_PrivateOwned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isPrivateOwned()
-	{
-		return privateOwned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#isPrivateOwned <em>Private Owned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Private Owned</em>' attribute.
-	 * @see #isPrivateOwned()
-	 * @generated
-	 */
-	public void setPrivateOwned(boolean newPrivateOwned)
-	{
-		boolean oldPrivateOwned = privateOwned;
-		privateOwned = newPrivateOwned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED, oldPrivateOwned, privateOwned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Fetch</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getJoinFetch <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #getJoinFetch()
-	 * @generated
-	 */
-	public void setJoinFetch(XmlJoinFetchType newJoinFetch)
-	{
-		XmlJoinFetchType oldJoinFetch = joinFetch;
-		joinFetch = newJoinFetch == null ? JOIN_FETCH_EDEFAULT : newJoinFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH, oldJoinFetch, joinFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Converter</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>Converter</em>' containment reference.
-	 * @see #setConverter(XmlConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlConverter getConverter()
-	{
-		return converter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetConverter(XmlConverter newConverter, NotificationChain msgs)
-	{
-		XmlConverter oldConverter = converter;
-		converter = newConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getConverter <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter</em>' containment reference.
-	 * @see #getConverter()
-	 * @generated
-	 */
-	public void setConverter(XmlConverter newConverter)
-	{
-		if (newConverter != converter)
-		{
-			NotificationChain msgs = null;
-			if (converter != null)
-				msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER, newConverter, newConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type Converter</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>Type Converter</em>' containment reference.
-	 * @see #setTypeConverter(XmlTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTypeConverter getTypeConverter()
-	{
-		return typeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTypeConverter(XmlTypeConverter newTypeConverter, NotificationChain msgs)
-	{
-		XmlTypeConverter oldTypeConverter = typeConverter;
-		typeConverter = newTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getTypeConverter <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Converter</em>' containment reference.
-	 * @see #getTypeConverter()
-	 * @generated
-	 */
-	public void setTypeConverter(XmlTypeConverter newTypeConverter)
-	{
-		if (newTypeConverter != typeConverter)
-		{
-			NotificationChain msgs = null;
-			if (typeConverter != null)
-				msgs = ((InternalEObject)typeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER, null, msgs);
-			msgs = basicSetTypeConverter(newTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER, newTypeConverter, newTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type Converter</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>Object Type Converter</em>' containment reference.
-	 * @see #setObjectTypeConverter(XmlObjectTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlObjectTypeConverter getObjectTypeConverter()
-	{
-		return objectTypeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter, NotificationChain msgs)
-	{
-		XmlObjectTypeConverter oldObjectTypeConverter = objectTypeConverter;
-		objectTypeConverter = newObjectTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER, oldObjectTypeConverter, newObjectTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type Converter</em>' containment reference.
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 */
-	public void setObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter)
-	{
-		if (newObjectTypeConverter != objectTypeConverter)
-		{
-			NotificationChain msgs = null;
-			if (objectTypeConverter != null)
-				msgs = ((InternalEObject)objectTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER, null, msgs);
-			msgs = basicSetObjectTypeConverter(newObjectTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER, newObjectTypeConverter, newObjectTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct Converter</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>Struct Converter</em>' containment reference.
-	 * @see #setStructConverter(XmlStructConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlStructConverter getStructConverter()
-	{
-		return structConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStructConverter(XmlStructConverter newStructConverter, NotificationChain msgs)
-	{
-		XmlStructConverter oldStructConverter = structConverter;
-		structConverter = newStructConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getStructConverter <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct Converter</em>' containment reference.
-	 * @see #getStructConverter()
-	 * @generated
-	 */
-	public void setStructConverter(XmlStructConverter newStructConverter)
-	{
-		if (newStructConverter != structConverter)
-		{
-			NotificationChain msgs = null;
-			if (structConverter != null)
-				msgs = ((InternalEObject)structConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER, null, msgs);
-			msgs = basicSetStructConverter(newStructConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER, newStructConverter, newStructConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key Association Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlAssociationOverride> getMapKeyAssociationOverrides()
-	{
-		if (mapKeyAssociationOverrides == null)
-		{
-			mapKeyAssociationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES);
-		}
-		return mapKeyAssociationOverrides;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key Convert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key Convert</em>' attribute.
-	 * @see #setMapKeyConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCollectionMapping_2_0_MapKeyConvert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getMapKeyConvert()
-	{
-		return mapKeyConvert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getMapKeyConvert <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map Key Convert</em>' attribute.
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 */
-	public void setMapKeyConvert(String newMapKeyConvert)
-	{
-		String oldMapKeyConvert = mapKeyConvert;
-		mapKeyConvert = newMapKeyConvert;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT, oldMapKeyConvert, mapKeyConvert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference.
-	 * @see #setBatchFetch(XmlBatchFetch)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlBatchFetch getBatchFetch()
-	{
-		return batchFetch;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs)
-	{
-		XmlBatchFetch oldBatchFetch = batchFetch;
-		batchFetch = newBatchFetch;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH, oldBatchFetch, newBatchFetch);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getBatchFetch <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Fetch</em>' containment reference.
-	 * @see #getBatchFetch()
-	 * @generated
-	 */
-	public void setBatchFetch(XmlBatchFetch newBatchFetch)
-	{
-		if (newBatchFetch != batchFetch)
-		{
-			NotificationChain msgs = null;
-			if (batchFetch != null)
-				msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH, null, msgs);
-			if (newBatchFetch != null)
-				msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH, null, msgs);
-			msgs = basicSetBatchFetch(newBatchFetch, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH, newBatchFetch, newBatchFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPartitioning_2_2 getPartitioning()
-	{
-		return partitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
-	{
-		XmlPartitioning_2_2 oldPartitioning = partitioning;
-		partitioning = newPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING, oldPartitioning, newPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
-	{
-		if (newPartitioning != partitioning)
-		{
-			NotificationChain msgs = null;
-			if (partitioning != null)
-				msgs = ((InternalEObject)partitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING, null, msgs);
-			if (newPartitioning != null)
-				msgs = ((InternalEObject)newPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING, null, msgs);
-			msgs = basicSetPartitioning(newPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING, newPartitioning, newPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
-	{
-		return replicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
-	{
-		XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
-		replicationPartitioning = newReplicationPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING, oldReplicationPartitioning, newReplicationPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
-	{
-		if (newReplicationPartitioning != replicationPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (replicationPartitioning != null)
-				msgs = ((InternalEObject)replicationPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING, null, msgs);
-			if (newReplicationPartitioning != null)
-				msgs = ((InternalEObject)newReplicationPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING, null, msgs);
-			msgs = basicSetReplicationPartitioning(newReplicationPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING, newReplicationPartitioning, newReplicationPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
-	{
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
-	{
-		XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
-		roundRobinPartitioning = newRoundRobinPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING, oldRoundRobinPartitioning, newRoundRobinPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
-	{
-		if (newRoundRobinPartitioning != roundRobinPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (roundRobinPartitioning != null)
-				msgs = ((InternalEObject)roundRobinPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING, null, msgs);
-			if (newRoundRobinPartitioning != null)
-				msgs = ((InternalEObject)newRoundRobinPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING, null, msgs);
-			msgs = basicSetRoundRobinPartitioning(newRoundRobinPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING, newRoundRobinPartitioning, newRoundRobinPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
-	{
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
-	{
-		XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
-		pinnedPartitioning = newPinnedPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING, oldPinnedPartitioning, newPinnedPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
-	{
-		if (newPinnedPartitioning != pinnedPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (pinnedPartitioning != null)
-				msgs = ((InternalEObject)pinnedPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING, null, msgs);
-			if (newPinnedPartitioning != null)
-				msgs = ((InternalEObject)newPinnedPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING, null, msgs);
-			msgs = basicSetPinnedPartitioning(newPinnedPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING, newPinnedPartitioning, newPinnedPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRangePartitioning_2_2 getRangePartitioning()
-	{
-		return rangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
-	{
-		XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
-		rangePartitioning = newRangePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING, oldRangePartitioning, newRangePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
-	{
-		if (newRangePartitioning != rangePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (rangePartitioning != null)
-				msgs = ((InternalEObject)rangePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING, null, msgs);
-			if (newRangePartitioning != null)
-				msgs = ((InternalEObject)newRangePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING, null, msgs);
-			msgs = basicSetRangePartitioning(newRangePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING, newRangePartitioning, newRangePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlValuePartitioning_2_2 getValuePartitioning()
-	{
-		return valuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
-	{
-		XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
-		valuePartitioning = newValuePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING, oldValuePartitioning, newValuePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
-	{
-		if (newValuePartitioning != valuePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (valuePartitioning != null)
-				msgs = ((InternalEObject)valuePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING, null, msgs);
-			if (newValuePartitioning != null)
-				msgs = ((InternalEObject)newValuePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING, null, msgs);
-			msgs = basicSetValuePartitioning(newValuePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING, newValuePartitioning, newValuePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlHashPartitioning_2_2 getHashPartitioning()
-	{
-		return hashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
-	{
-		XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
-		hashPartitioning = newHashPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING, oldHashPartitioning, newHashPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
-	{
-		if (newHashPartitioning != hashPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (hashPartitioning != null)
-				msgs = ((InternalEObject)hashPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING, null, msgs);
-			if (newHashPartitioning != null)
-				msgs = ((InternalEObject)newHashPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING, null, msgs);
-			msgs = basicSetHashPartitioning(newHashPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING, newHashPartitioning, newHashPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlUnionPartitioning_2_2 getUnionPartitioning()
-	{
-		return unionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
-	{
-		XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
-		unionPartitioning = newUnionPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING, oldUnionPartitioning, newUnionPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
-	{
-		if (newUnionPartitioning != unionPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (unionPartitioning != null)
-				msgs = ((InternalEObject)unionPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING, null, msgs);
-			if (newUnionPartitioning != null)
-				msgs = ((InternalEObject)newUnionPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING, null, msgs);
-			msgs = basicSetUnionPartitioning(newUnionPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING, newUnionPartitioning, newUnionPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPartitioned()
-	{
-		return partitioned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	public void setPartitioned(String newPartitioned)
-	{
-		String oldPartitioned = partitioned;
-		partitioned = newPartitioned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED, oldPartitioned, partitioned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCascadeOnDelete()
-	{
-		return cascadeOnDelete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	public void setCascadeOnDelete(Boolean newCascadeOnDelete)
-	{
-		Boolean oldCascadeOnDelete = cascadeOnDelete;
-		cascadeOnDelete = newCascadeOnDelete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__CASCADE_ON_DELETE, oldCascadeOnDelete, cascadeOnDelete));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Noncacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Noncacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Noncacheable</em>' attribute.
-	 * @see #setNoncacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany_2_2_Noncacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isNoncacheable()
-	{
-		return noncacheable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#isNoncacheable <em>Noncacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Noncacheable</em>' attribute.
-	 * @see #isNoncacheable()
-	 * @generated
-	 */
-	public void setNoncacheable(boolean newNoncacheable)
-	{
-		boolean oldNoncacheable = noncacheable;
-		noncacheable = newNoncacheable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE, oldNoncacheable, noncacheable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Delete All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delete All</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delete All</em>' attribute.
-	 * @see #setDeleteAll(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany_2_4_DeleteAll()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isDeleteAll()
-	{
-		return deleteAll;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#isDeleteAll <em>Delete All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delete All</em>' attribute.
-	 * @see #isDeleteAll()
-	 * @generated
-	 */
-	public void setDeleteAll(boolean newDeleteAll)
-	{
-		boolean oldDeleteAll = deleteAll;
-		deleteAll = newDeleteAll;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL, oldDeleteAll, deleteAll));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToMany#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER:
-				return basicSetStructConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return ((InternalEList<?>)getMapKeyAssociationOverrides()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH:
-				return basicSetBatchFetch(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING:
-				return basicSetPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING:
-				return basicSetReplicationPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				return basicSetRoundRobinPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING:
-				return basicSetPinnedPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING:
-				return basicSetRangePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING:
-				return basicSetValuePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING:
-				return basicSetHashPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING:
-				return basicSetUnionPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return getMapKeyAssociationOverrides();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
-				return getMapKeyConvert();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH:
-				return getBatchFetch();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED:
-				return getPartitioned();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CASCADE_ON_DELETE:
-				return getCascadeOnDelete();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE:
-				return isNoncacheable();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL:
-				return isDeleteAll();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED:
-				return isPrivateOwned();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH:
-				return getJoinFetch();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				getMapKeyAssociationOverrides().clear();
-				getMapKeyAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
-				setMapKeyConvert((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED:
-				setPartitioned((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CASCADE_ON_DELETE:
-				setCascadeOnDelete((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE:
-				setNoncacheable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL:
-				setDeleteAll((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED:
-				setPrivateOwned((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				getMapKeyAssociationOverrides().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
-				setMapKeyConvert(MAP_KEY_CONVERT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED:
-				setPartitioned(PARTITIONED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CASCADE_ON_DELETE:
-				setCascadeOnDelete(CASCADE_ON_DELETE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE:
-				setNoncacheable(NONCACHEABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL:
-				setDeleteAll(DELETE_ALL_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED:
-				setPrivateOwned(PRIVATE_OWNED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES:
-				return mapKeyAssociationOverrides != null && !mapKeyAssociationOverrides.isEmpty();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT:
-				return MAP_KEY_CONVERT_EDEFAULT == null ? mapKeyConvert != null : !MAP_KEY_CONVERT_EDEFAULT.equals(mapKeyConvert);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH:
-				return batchFetch != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING:
-				return partitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING:
-				return pinnedPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING:
-				return rangePartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING:
-				return valuePartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING:
-				return hashPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING:
-				return unionPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED:
-				return PARTITIONED_EDEFAULT == null ? partitioned != null : !PARTITIONED_EDEFAULT.equals(partitioned);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CASCADE_ON_DELETE:
-				return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete);
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE:
-				return noncacheable != NONCACHEABLE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL:
-				return deleteAll != DELETE_ALL_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED:
-				return privateOwned != PRIVATE_OWNED_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCollectionMapping_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT: return EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBatchFetchHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__CASCADE_ON_DELETE: return EclipseLinkOrmV2_2Package.XML_ONE_TO_MANY_22__CASCADE_ON_DELETE;
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE: return EclipseLinkOrmV2_2Package.XML_ONE_TO_MANY_22__NONCACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany_2_4.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL: return EclipseLinkOrmV2_4Package.XML_ONE_TO_MANY_24__DELETE_ALL;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPrivateOwned.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				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 == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMapKeyAssociationOverrideContainer_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_ASSOCIATION_OVERRIDES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlCollectionMapping_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__MAP_KEY_CONVERT;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlBatchFetchHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__UNION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_ONE_TO_MANY_22__CASCADE_ON_DELETE: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__CASCADE_ON_DELETE;
-				case EclipseLinkOrmV2_2Package.XML_ONE_TO_MANY_22__NONCACHEABLE: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__NONCACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToMany_2_4.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_4Package.XML_ONE_TO_MANY_24__DELETE_ALL: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__DELETE_ALL;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPrivateOwned.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__PRIVATE_OWNED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_MANY__JOIN_FETCH;
-				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(" (mapKeyConvert: ");
-		result.append(mapKeyConvert);
-		result.append(", attributeType: ");
-		result.append(attributeType);
-		result.append(", partitioned: ");
-		result.append(partitioned);
-		result.append(", cascadeOnDelete: ");
-		result.append(cascadeOnDelete);
-		result.append(", noncacheable: ");
-		result.append(noncacheable);
-		result.append(", deleteAll: ");
-		result.append(deleteAll);
-		result.append(", privateOwned: ");
-		result.append(privateOwned);
-		result.append(", joinFetch: ");
-		result.append(joinFetch);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getPrivateOwnedTextRange() {
-		return getElementTextRange(EclipseLink.PRIVATE_OWNED);
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLink.JOIN_FETCH);
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlOneToMany(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildTargetEntityTranslator(),
-			buildFetchTranslator(),
-			buildAccessTranslator(),
-			buildMappedByTranslator(),
-			buildOrphanRemovalTranslator(),
-			buildAttributeTypeTranslator(),
-			buildOrderByTranslator(),
-			XmlOrderColumn.buildTranslator(JPA2_0.ORDER_COLUMN, OrmV2_0Package.eINSTANCE.getXmlOrderable_2_0_OrderColumn()),		
-			buildMapKeyTranslator(),
-			buildMapKeyClassTranslator(),
-			buildMapKeyTemporalTranslator(),
-			buildMapKeyEnumeratedTranslator(),
-			buildMapKeyConvertTranslator(),
-			buildMapKeyAttributeOverrideTranslator(),
-			buildMapKeyAssociationOverrideTranslator(),
-			buildMapKeyColumnTranslator(),
-			buildMapKeyJoinColumnTranslator(),
-			buildConverterTranslator(),
-			buildTypeConverterTranslator(),
-			buildObjectTypeConverterTranslator(),
-			buildStructConverterTranslator(),
-			buildJoinTableTranslator(),
-			buildJoinColumnTranslator(),
-			buildCascadeTranslator(),
-			buildCascadeOnDeleteTranslator(),
-			buildPrivateOwnedTranslator(),
-			buildJoinFetchTranslator(),
-			buildBatchFetchTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator(),
-			buildNoncacheableTranslator(),
-			buildDeleteAllTranslator(),
-		    XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioning()),
-			XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ReplicationPartitioning()),
-			XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RoundRobinPartitioning()),
-			XmlPinnedPartitioning.buildTranslator(EclipseLink2_2.PINNED_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_PinnedPartitioning()),
-			XmlRangePartitioning.buildTranslator(EclipseLink2_2.RANGE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RangePartitioning()),
-			XmlValuePartitioning.buildTranslator(EclipseLink2_2.VALUE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ValuePartitioning()),
-			XmlHashPartitioning.buildTranslator(EclipseLink2_2.HASH_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_HashPartitioning()),
-			XmlUnionPartitioning.buildTranslator(EclipseLink2_2.UNION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_UnionPartitioning()),
-			buildPartitionedTranslator(),
-		};
-	}
-	
-	protected static Translator buildMapKeyConvertTranslator() {
-		return new Translator(JPA2_0.MAP_KEY_CONVERT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlCollectionMapping_2_0_MapKeyConvert());
-	}
-	
-	protected static Translator buildMapKeyAssociationOverrideTranslator() {
-		return XmlAssociationOverride.buildTranslator(EclipseLink2_0.MAP_KEY_ASSOCIATION_OVERRIDE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides());
-	}	
-	
-	protected static Translator buildConverterTranslator() {
-		return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_Converter());
-	}
-	
-	protected static Translator buildTypeConverterTranslator() {
-		return XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_TypeConverter());
-	}
-	
-	protected static Translator buildObjectTypeConverterTranslator() {
-		return XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_ObjectTypeConverter());
-	}
-	
-	protected static Translator buildStructConverterTranslator() {
-		return XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_StructConverter());
-	}
-	
-	protected static Translator buildPrivateOwnedTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink.PRIVATE_OWNED, EclipseLinkOrmPackage.eINSTANCE.getXmlPrivateOwned_PrivateOwned());
-	}
-	
-	protected static Translator buildJoinFetchTranslator() {
-		return new Translator(EclipseLink.JOIN_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlOneToMany_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildBatchFetchTranslator() {
-		return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch());
-	}
-
-	protected static Translator buildCascadeOnDeleteTranslator() {
-		return CascadeType.buildTranslator(EclipseLink2_2.CASCADE_ON_DELETE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlOneToMany_2_2_CascadeOnDelete());
-	}
-
-	protected static Translator buildJoinTableTranslator() {
-		return XmlJoinTable.buildTranslator(JPA.JOIN_TABLE, OrmPackage.eINSTANCE.getXmlJoinTableContainer_JoinTable());
-	}
-
-	protected static Translator buildNoncacheableTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink2_2.NONCACHEABLE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlOneToMany_2_2_Noncacheable());
-	}
-
-    protected static Translator buildPartitionedTranslator() {
-		return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned());
-	}
-   
-	protected static Translator buildDeleteAllTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink2_4.DELETE_ALL, EclipseLinkOrmV2_4Package.eINSTANCE.getXmlOneToMany_2_4_DeleteAll());
-	}
-}
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
deleted file mode 100644
index 65173b5cd7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOneToOne.java
+++ /dev/null
@@ -1,1643 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.jpa.core.resource.orm.CascadeType;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1;
-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.XmlHashPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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.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;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml One To One</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne()
- * @model kind="class"
- * @generated
- */
-public class XmlOneToOne extends org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne implements XmlOneToOne_2_1, XmlOneToOne_2_2, XmlAttributeMapping, XmlPrivateOwned, XmlJoinFetch
-{
-	/**
-	 * The cached value of the '{@link #getBatchFetch() <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBatchFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlBatchFetch batchFetch;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPartitioning_2_2 partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReplicationPartitioning_2_2 replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRangePartitioning_2_2 rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlValuePartitioning_2_2 valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlHashPartitioning_2_2 hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlUnionPartitioning_2_2 unionPartitioning;
-
-	/**
-	 * The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARTITIONED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected String partitioned = PARTITIONED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CASCADE_ON_DELETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCascadeOnDelete() <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cascadeOnDelete = CASCADE_ON_DELETE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNonCacheable() <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNonCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NON_CACHEABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNonCacheable() <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNonCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean nonCacheable = NON_CACHEABLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The default value of the '{@link #isPrivateOwned() <em>Private Owned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPrivateOwned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PRIVATE_OWNED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isPrivateOwned() <em>Private Owned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPrivateOwned()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean privateOwned = PRIVATE_OWNED_EDEFAULT;
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final XmlJoinFetchType JOIN_FETCH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJoinFetch() <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJoinFetch()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlJoinFetchType joinFetch = JOIN_FETCH_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlOneToOne()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ONE_TO_ONE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Batch Fetch</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>Batch Fetch</em>' containment reference.
-	 * @see #setBatchFetch(XmlBatchFetch)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBatchFetchHolder_BatchFetch()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlBatchFetch getBatchFetch()
-	{
-		return batchFetch;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBatchFetch(XmlBatchFetch newBatchFetch, NotificationChain msgs)
-	{
-		XmlBatchFetch oldBatchFetch = batchFetch;
-		batchFetch = newBatchFetch;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH, oldBatchFetch, newBatchFetch);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getBatchFetch <em>Batch Fetch</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Fetch</em>' containment reference.
-	 * @see #getBatchFetch()
-	 * @generated
-	 */
-	public void setBatchFetch(XmlBatchFetch newBatchFetch)
-	{
-		if (newBatchFetch != batchFetch)
-		{
-			NotificationChain msgs = null;
-			if (batchFetch != null)
-				msgs = ((InternalEObject)batchFetch).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH, null, msgs);
-			if (newBatchFetch != null)
-				msgs = ((InternalEObject)newBatchFetch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH, null, msgs);
-			msgs = basicSetBatchFetch(newBatchFetch, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH, newBatchFetch, newBatchFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPartitioning_2_2 getPartitioning()
-	{
-		return partitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
-	{
-		XmlPartitioning_2_2 oldPartitioning = partitioning;
-		partitioning = newPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING, oldPartitioning, newPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
-	{
-		if (newPartitioning != partitioning)
-		{
-			NotificationChain msgs = null;
-			if (partitioning != null)
-				msgs = ((InternalEObject)partitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING, null, msgs);
-			if (newPartitioning != null)
-				msgs = ((InternalEObject)newPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING, null, msgs);
-			msgs = basicSetPartitioning(newPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING, newPartitioning, newPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
-	{
-		return replicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
-	{
-		XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
-		replicationPartitioning = newReplicationPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING, oldReplicationPartitioning, newReplicationPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
-	{
-		if (newReplicationPartitioning != replicationPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (replicationPartitioning != null)
-				msgs = ((InternalEObject)replicationPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING, null, msgs);
-			if (newReplicationPartitioning != null)
-				msgs = ((InternalEObject)newReplicationPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING, null, msgs);
-			msgs = basicSetReplicationPartitioning(newReplicationPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING, newReplicationPartitioning, newReplicationPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
-	{
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
-	{
-		XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
-		roundRobinPartitioning = newRoundRobinPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING, oldRoundRobinPartitioning, newRoundRobinPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
-	{
-		if (newRoundRobinPartitioning != roundRobinPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (roundRobinPartitioning != null)
-				msgs = ((InternalEObject)roundRobinPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING, null, msgs);
-			if (newRoundRobinPartitioning != null)
-				msgs = ((InternalEObject)newRoundRobinPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING, null, msgs);
-			msgs = basicSetRoundRobinPartitioning(newRoundRobinPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING, newRoundRobinPartitioning, newRoundRobinPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
-	{
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
-	{
-		XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
-		pinnedPartitioning = newPinnedPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING, oldPinnedPartitioning, newPinnedPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
-	{
-		if (newPinnedPartitioning != pinnedPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (pinnedPartitioning != null)
-				msgs = ((InternalEObject)pinnedPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING, null, msgs);
-			if (newPinnedPartitioning != null)
-				msgs = ((InternalEObject)newPinnedPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING, null, msgs);
-			msgs = basicSetPinnedPartitioning(newPinnedPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING, newPinnedPartitioning, newPinnedPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRangePartitioning_2_2 getRangePartitioning()
-	{
-		return rangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
-	{
-		XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
-		rangePartitioning = newRangePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING, oldRangePartitioning, newRangePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
-	{
-		if (newRangePartitioning != rangePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (rangePartitioning != null)
-				msgs = ((InternalEObject)rangePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING, null, msgs);
-			if (newRangePartitioning != null)
-				msgs = ((InternalEObject)newRangePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING, null, msgs);
-			msgs = basicSetRangePartitioning(newRangePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING, newRangePartitioning, newRangePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlValuePartitioning_2_2 getValuePartitioning()
-	{
-		return valuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
-	{
-		XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
-		valuePartitioning = newValuePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING, oldValuePartitioning, newValuePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
-	{
-		if (newValuePartitioning != valuePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (valuePartitioning != null)
-				msgs = ((InternalEObject)valuePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING, null, msgs);
-			if (newValuePartitioning != null)
-				msgs = ((InternalEObject)newValuePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING, null, msgs);
-			msgs = basicSetValuePartitioning(newValuePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING, newValuePartitioning, newValuePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlHashPartitioning_2_2 getHashPartitioning()
-	{
-		return hashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
-	{
-		XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
-		hashPartitioning = newHashPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING, oldHashPartitioning, newHashPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
-	{
-		if (newHashPartitioning != hashPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (hashPartitioning != null)
-				msgs = ((InternalEObject)hashPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING, null, msgs);
-			if (newHashPartitioning != null)
-				msgs = ((InternalEObject)newHashPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING, null, msgs);
-			msgs = basicSetHashPartitioning(newHashPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING, newHashPartitioning, newHashPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlUnionPartitioning_2_2 getUnionPartitioning()
-	{
-		return unionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
-	{
-		XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
-		unionPartitioning = newUnionPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING, oldUnionPartitioning, newUnionPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
-	{
-		if (newUnionPartitioning != unionPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (unionPartitioning != null)
-				msgs = ((InternalEObject)unionPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING, null, msgs);
-			if (newUnionPartitioning != null)
-				msgs = ((InternalEObject)newUnionPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING, null, msgs);
-			msgs = basicSetUnionPartitioning(newUnionPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING, newUnionPartitioning, newUnionPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPartitioned()
-	{
-		return partitioned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	public void setPartitioned(String newPartitioned)
-	{
-		String oldPartitioned = partitioned;
-		partitioned = newPartitioned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED, oldPartitioned, partitioned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCascadeOnDelete()
-	{
-		return cascadeOnDelete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	public void setCascadeOnDelete(Boolean newCascadeOnDelete)
-	{
-		Boolean oldCascadeOnDelete = cascadeOnDelete;
-		cascadeOnDelete = newCascadeOnDelete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__CASCADE_ON_DELETE, oldCascadeOnDelete, cascadeOnDelete));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #setNonCacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne_2_2_NonCacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isNonCacheable()
-	{
-		return nonCacheable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#isNonCacheable <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #isNonCacheable()
-	 * @generated
-	 */
-	public void setNonCacheable(boolean newNonCacheable)
-	{
-		boolean oldNonCacheable = nonCacheable;
-		nonCacheable = newNonCacheable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE, oldNonCacheable, nonCacheable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Private Owned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Private Owned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Private Owned</em>' attribute.
-	 * @see #setPrivateOwned(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned_PrivateOwned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isPrivateOwned()
-	{
-		return privateOwned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#isPrivateOwned <em>Private Owned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Private Owned</em>' attribute.
-	 * @see #isPrivateOwned()
-	 * @generated
-	 */
-	public void setPrivateOwned(boolean newPrivateOwned)
-	{
-		boolean oldPrivateOwned = privateOwned;
-		privateOwned = newPrivateOwned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIVATE_OWNED, oldPrivateOwned, privateOwned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Join Fetch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Join Fetch</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #setJoinFetch(XmlJoinFetchType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch_JoinFetch()
-	 * @model
-	 * @generated
-	 */
-	public XmlJoinFetchType getJoinFetch()
-	{
-		return joinFetch;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getJoinFetch <em>Join Fetch</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Join Fetch</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetchType
-	 * @see #getJoinFetch()
-	 * @generated
-	 */
-	public void setJoinFetch(XmlJoinFetchType newJoinFetch)
-	{
-		XmlJoinFetchType oldJoinFetch = joinFetch;
-		joinFetch = newJoinFetch == null ? JOIN_FETCH_EDEFAULT : newJoinFetch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FETCH, oldJoinFetch, joinFetch));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOneToOne#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH:
-				return basicSetBatchFetch(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING:
-				return basicSetPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				return basicSetReplicationPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return basicSetRoundRobinPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING:
-				return basicSetPinnedPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING:
-				return basicSetRangePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING:
-				return basicSetValuePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING:
-				return basicSetHashPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING:
-				return basicSetUnionPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH:
-				return getBatchFetch();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED:
-				return getPartitioned();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__CASCADE_ON_DELETE:
-				return getCascadeOnDelete();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE:
-				return isNonCacheable();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIVATE_OWNED:
-				return isPrivateOwned();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FETCH:
-				return getJoinFetch();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED:
-				setPartitioned((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__CASCADE_ON_DELETE:
-				setCascadeOnDelete((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE:
-				setNonCacheable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIVATE_OWNED:
-				setPrivateOwned((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FETCH:
-				setJoinFetch((XmlJoinFetchType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH:
-				setBatchFetch((XmlBatchFetch)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED:
-				setPartitioned(PARTITIONED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__CASCADE_ON_DELETE:
-				setCascadeOnDelete(CASCADE_ON_DELETE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE:
-				setNonCacheable(NON_CACHEABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIVATE_OWNED:
-				setPrivateOwned(PRIVATE_OWNED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FETCH:
-				setJoinFetch(JOIN_FETCH_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH:
-				return batchFetch != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING:
-				return partitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING:
-				return pinnedPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING:
-				return rangePartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING:
-				return valuePartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING:
-				return hashPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING:
-				return unionPartitioning != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED:
-				return PARTITIONED_EDEFAULT == null ? partitioned != null : !PARTITIONED_EDEFAULT.equals(partitioned);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__CASCADE_ON_DELETE:
-				return CASCADE_ON_DELETE_EDEFAULT == null ? cascadeOnDelete != null : !CASCADE_ON_DELETE_EDEFAULT.equals(cascadeOnDelete);
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE:
-				return nonCacheable != NON_CACHEABLE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIVATE_OWNED:
-				return privateOwned != PRIVATE_OWNED_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FETCH:
-				return joinFetch != JOIN_FETCH_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlBatchFetchHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH: return EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__CASCADE_ON_DELETE: return EclipseLinkOrmV2_2Package.XML_ONE_TO_ONE_22__CASCADE_ON_DELETE;
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE: return EclipseLinkOrmV2_2Package.XML_ONE_TO_ONE_22__NON_CACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPrivateOwned.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FETCH: return EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-				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 == XmlBatchFetchHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__BATCH_FETCH;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__UNION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlOneToOne_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_ONE_TO_ONE_22__CASCADE_ON_DELETE: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__CASCADE_ON_DELETE;
-				case EclipseLinkOrmV2_2Package.XML_ONE_TO_ONE_22__NON_CACHEABLE: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__NON_CACHEABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPrivateOwned.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PRIVATE_OWNED__PRIVATE_OWNED: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__PRIVATE_OWNED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlJoinFetch.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH: return EclipseLinkOrmPackage.XML_ONE_TO_ONE__JOIN_FETCH;
-				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(" (partitioned: ");
-		result.append(partitioned);
-		result.append(", cascadeOnDelete: ");
-		result.append(cascadeOnDelete);
-		result.append(", nonCacheable: ");
-		result.append(nonCacheable);
-		result.append(", privateOwned: ");
-		result.append(privateOwned);
-		result.append(", joinFetch: ");
-		result.append(joinFetch);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getPrivateOwnedTextRange() {
-		return getElementTextRange(EclipseLink.PRIVATE_OWNED);
-	}
-	
-	public TextRange getJoinFetchTextRange() {
-		return getElementTextRange(EclipseLink.JOIN_FETCH);
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlOneToOne(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildTargetEntityTranslator(),
-			buildFetchTranslator(),
-			buildOptionalTranslator(),
-			buildAccessTranslator(),
-			buildMappedByTranslator(),
-			buildOrphanRemovalTranslator(),
-			buildMapsIdTranslator(),
-			buildIdTranslator(),
-			buildPrimaryKeyJoinColumnTranslator(),
-			buildJoinColumnTranslator(),
-			buildJoinTableTranslator(),
-			buildCascadeTranslator(),
-			buildCascadeOnDeleteTranslator(),
-			buildPrivateOwnedTranslator(),
-			buildJoinFetchTranslator(),
-			buildBatchFetchTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator(),
-			buildNoncacheableTranslator(),
-		    XmlPartitioning.buildTranslator(EclipseLink2_2.PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioning()),
-			XmlReplicationPartitioning.buildTranslator(EclipseLink2_2.REPLICATION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ReplicationPartitioning()),
-			XmlRoundRobinPartitioning.buildTranslator(EclipseLink2_2.ROUND_ROBIN_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RoundRobinPartitioning()),
-			XmlPinnedPartitioning.buildTranslator(EclipseLink2_2.PINNED_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_PinnedPartitioning()),
-			XmlRangePartitioning.buildTranslator(EclipseLink2_2.RANGE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_RangePartitioning()),
-			XmlValuePartitioning.buildTranslator(EclipseLink2_2.VALUE_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_ValuePartitioning()),
-			XmlHashPartitioning.buildTranslator(EclipseLink2_2.HASH_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_HashPartitioning()),
-			XmlUnionPartitioning.buildTranslator(EclipseLink2_2.UNION_PARTITIONING, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_UnionPartitioning()),
-			buildPartitionedTranslator(),
-		};
-	}
-	
-	protected static Translator buildPrivateOwnedTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink.PRIVATE_OWNED, EclipseLinkOrmPackage.eINSTANCE.getXmlPrivateOwned_PrivateOwned());
-	}
-	
-	protected static Translator buildJoinFetchTranslator() {
-		return new Translator(EclipseLink.JOIN_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlJoinFetch_JoinFetch());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildBatchFetchTranslator() {
-		return XmlBatchFetch.buildTranslator(EclipseLink2_1.BATCH_FETCH, EclipseLinkOrmPackage.eINSTANCE.getXmlBatchFetchHolder_BatchFetch());
-	}
-
-	protected static Translator buildCascadeOnDeleteTranslator() {
-		return CascadeType.buildTranslator(EclipseLink2_2.CASCADE_ON_DELETE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlOneToOne_2_2_CascadeOnDelete());
-	}
-
-	protected static Translator buildJoinTableTranslator() {
-		return XmlJoinTable.buildTranslator(JPA.JOIN_TABLE, OrmPackage.eINSTANCE.getXmlJoinTableContainer_JoinTable());
-	}
-
-	protected static Translator buildNoncacheableTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink2_2.NONCACHEABLE, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlOneToOne_2_2_NonCacheable());
-	}
-
-    protected static Translator buildPartitionedTranslator() {
-		return new Translator(EclipseLink2_2.PARTITIONING_GROUP__PARTITIONED, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned());
-	}
-}
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
deleted file mode 100644
index 2a10792549..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLocking.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.BooleanTranslator;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Optimistic Locking</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.2
- * @since 2.2
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getCascade <em>Cascade</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getSelectedColumns <em>Selected Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlOptimisticLocking extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final XmlOptimisticLockingType 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 XmlOptimisticLockingType type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCascade() <em>Cascade</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascade()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean CASCADE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCascade() <em>Cascade</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCascade()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean cascade = CASCADE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSelectedColumns() <em>Selected Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSelectedColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlColumn> selectedColumns;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlOptimisticLocking()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_OPTIMISTIC_LOCKING;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType}.
-	 * <!-- 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 org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType
-	 * @see #setType(XmlOptimisticLockingType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking_Type()
-	 * @model
-	 * @generated
-	 */
-	public XmlOptimisticLockingType getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLockingType
-	 * @see #getType()
-	 * @generated
-	 */
-	public void setType(XmlOptimisticLockingType newType)
-	{
-		XmlOptimisticLockingType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__TYPE, oldType, type));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cascade</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade</em>' attribute.
-	 * @see #setCascade(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking_Cascade()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getCascade()
-	{
-		return cascade;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOptimisticLocking#getCascade <em>Cascade</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade</em>' attribute.
-	 * @see #getCascade()
-	 * @generated
-	 */
-	public void setCascade(Boolean newCascade)
-	{
-		Boolean oldCascade = cascade;
-		cascade = newCascade;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__CASCADE, oldCascade, cascade));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Selected Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Selected Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Selected Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLocking_SelectedColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlColumn> getSelectedColumns()
-	{
-		if (selectedColumns == null)
-		{
-			selectedColumns = new EObjectContainmentEList<XmlColumn>(XmlColumn.class, this, EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS);
-		}
-		return selectedColumns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS:
-				return ((InternalEList<?>)getSelectedColumns()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__TYPE:
-				return getType();
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__CASCADE:
-				return getCascade();
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS:
-				return getSelectedColumns();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__TYPE:
-				setType((XmlOptimisticLockingType)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__CASCADE:
-				setCascade((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS:
-				getSelectedColumns().clear();
-				getSelectedColumns().addAll((Collection<? extends XmlColumn>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__CASCADE:
-				setCascade(CASCADE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS:
-				getSelectedColumns().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__TYPE:
-				return type != TYPE_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__CASCADE:
-				return CASCADE_EDEFAULT == null ? cascade != null : !CASCADE_EDEFAULT.equals(cascade);
-			case EclipseLinkOrmPackage.XML_OPTIMISTIC_LOCKING__SELECTED_COLUMNS:
-				return selectedColumns != null && !selectedColumns.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(" (type: ");
-		result.append(type);
-		result.append(", cascade: ");
-		result.append(cascade);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildTypeTranslator(),
-			buildCascadeTranslator(),
-			buildSelectedColumnTranslator(),
-		};
-	}
-	
-	protected static Translator buildTypeTranslator() {
-		return new Translator(EclipseLink.OPTIMISTIC_LOCKING__TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlOptimisticLocking_Type(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildCascadeTranslator() {
-		return new BooleanTranslator(EclipseLink.OPTIMISTIC_LOCKING__CASCADE, EclipseLinkOrmPackage.eINSTANCE.getXmlOptimisticLocking_Cascade(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildSelectedColumnTranslator() {
-		return XmlColumn.buildTranslator(EclipseLink.OPTIMISTIC_LOCKING__SELECTED_COLUMN, EclipseLinkOrmPackage.eINSTANCE.getXmlOptimisticLocking_SelectedColumns());
-	}
-
-} // XmlOptimisticLocking
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLockingType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLockingType.java
deleted file mode 100644
index 508934af9b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOptimisticLockingType.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-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>Xml Optimistic Locking Type</b></em>',
- * and utility methods for working with them.
- *  
- * 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.
- * 
- * @version 2.2
- * @since 2.2
- * 
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOptimisticLockingType()
- * @model
- * @generated
- */
-public enum XmlOptimisticLockingType implements Enumerator
-{
-	/**
-	 * The '<em><b>ALL COLUMNS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ALL_COLUMNS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ALL_COLUMNS(0, "ALL_COLUMNS", "ALL_COLUMNS"),
-
-	/**
-	 * The '<em><b>CHANGED COLUMNS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CHANGED_COLUMNS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CHANGED_COLUMNS(1, "CHANGED_COLUMNS", "CHANGED_COLUMNS"),
-
-	/**
-	 * The '<em><b>SELECTED COLUMNS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SELECTED_COLUMNS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SELECTED_COLUMNS(2, "SELECTED_COLUMNS", "SELECTED_COLUMNS"),
-
-	/**
-	 * The '<em><b>VERSION COLUMN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #VERSION_COLUMN_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	VERSION_COLUMN(3, "VERSION_COLUMN", "VERSION_COLUMN");
-
-	/**
-	 * The '<em><b>ALL COLUMNS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ALL COLUMNS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ALL_COLUMNS
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ALL_COLUMNS_VALUE = 0;
-
-	/**
-	 * The '<em><b>CHANGED COLUMNS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CHANGED COLUMNS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CHANGED_COLUMNS
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CHANGED_COLUMNS_VALUE = 1;
-
-	/**
-	 * The '<em><b>SELECTED COLUMNS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SELECTED COLUMNS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SELECTED_COLUMNS
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SELECTED_COLUMNS_VALUE = 2;
-
-	/**
-	 * The '<em><b>VERSION COLUMN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>VERSION COLUMN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #VERSION_COLUMN
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int VERSION_COLUMN_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>Xml Optimistic Locking Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final XmlOptimisticLockingType[] VALUES_ARRAY =
-		new XmlOptimisticLockingType[]
-		{
-			ALL_COLUMNS,
-			CHANGED_COLUMNS,
-			SELECTED_COLUMNS,
-			VERSION_COLUMN,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Xml Optimistic Locking Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<XmlOptimisticLockingType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Xml Optimistic Locking Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlOptimisticLockingType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlOptimisticLockingType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Optimistic Locking Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlOptimisticLockingType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			XmlOptimisticLockingType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Xml Optimistic Locking Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static XmlOptimisticLockingType get(int value)
-	{
-		switch (value)
-		{
-			case ALL_COLUMNS_VALUE: return ALL_COLUMNS;
-			case CHANGED_COLUMNS_VALUE: return CHANGED_COLUMNS;
-			case SELECTED_COLUMNS_VALUE: return SELECTED_COLUMNS;
-			case VERSION_COLUMN_VALUE: return VERSION_COLUMN;
-		}
-		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 XmlOptimisticLockingType(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;
-	}
-	
-} //XmlOptimisticLockingType
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOrderColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOrderColumn.java
deleted file mode 100644
index f6273a9229..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlOrderColumn.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.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_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.OrderCorrectionType_2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Order Column</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOrderColumn()
- * @model kind="class"
- * @generated
- */
-public class XmlOrderColumn extends org.eclipse.jpt.jpa.core.resource.orm.XmlOrderColumn implements XmlOrderColumn_2_0
-{
-
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final OrderCorrectionType_2_0 CORRECTION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCorrectionType() <em>Correction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCorrectionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected OrderCorrectionType_2_0 correctionType = CORRECTION_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlOrderColumn()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ORDER_COLUMN;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Correction Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Correction 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>Correction Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0
-	 * @see #setCorrectionType(OrderCorrectionType_2_0)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOrderColumn_2_0_CorrectionType()
-	 * @model
-	 * @generated
-	 */
-	public OrderCorrectionType_2_0 getCorrectionType()
-	{
-		return correctionType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlOrderColumn#getCorrectionType <em>Correction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Correction Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0
-	 * @see #getCorrectionType()
-	 * @generated
-	 */
-	public void setCorrectionType(OrderCorrectionType_2_0 newCorrectionType)
-	{
-		OrderCorrectionType_2_0 oldCorrectionType = correctionType;
-		correctionType = newCorrectionType == null ? CORRECTION_TYPE_EDEFAULT : newCorrectionType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ORDER_COLUMN__CORRECTION_TYPE, oldCorrectionType, correctionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ORDER_COLUMN__CORRECTION_TYPE:
-				return getCorrectionType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ORDER_COLUMN__CORRECTION_TYPE:
-				setCorrectionType((OrderCorrectionType_2_0)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ORDER_COLUMN__CORRECTION_TYPE:
-				setCorrectionType(CORRECTION_TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ORDER_COLUMN__CORRECTION_TYPE:
-				return correctionType != CORRECTION_TYPE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlOrderColumn_2_0.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ORDER_COLUMN__CORRECTION_TYPE: return EclipseLinkOrmV2_0Package.XML_ORDER_COLUMN_20__CORRECTION_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 == XmlOrderColumn_2_0.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_0Package.XML_ORDER_COLUMN_20__CORRECTION_TYPE: return EclipseLinkOrmPackage.XML_ORDER_COLUMN__CORRECTION_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(" (correctionType: ");
-		result.append(correctionType);
-		result.append(')');
-		return result.toString();
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName,
-			structuralFeature,
-			Translator.END_TAG_NO_INDENT,
-			buildTranslatorChildren()
-		);
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildNullableTranslator(),
-			buildInsertableTranslator(),
-			buildUpdatableTranslator(),
-			buildColumnDefinitionTranslator(),
-			buildCorrectionTypeTranslator(),
-		};
-	}
-		
-	protected static Translator buildCorrectionTypeTranslator() {
-		return new Translator(EclipseLink2_0.CORRECTION_TYPE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlOrderColumn_2_0_CorrectionType(), Translator.DOM_ATTRIBUTE);
-	}
-}
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
deleted file mode 100644
index 314ca5d908..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPartitioning.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Partitioning</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioning()
- * @model kind="class"
- * @generated
- */
-public class XmlPartitioning extends AbstractJpaEObject implements XmlPartitioning_2_2
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPartitioning()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_PARTITIONING;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPartitioning#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PARTITIONING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PARTITIONING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PARTITIONING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PARTITIONING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PARTITIONING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlPartitioning(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-		};
-	}
-	
-	protected static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPartitioning_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-
-} // XmlPartitioning
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
deleted file mode 100644
index 9dedcb8ce9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitDefaults.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Persistence Unit Defaults</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults()
- * @model kind="class"
- * @generated
- */
-public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitDefaults implements XmlPersistenceUnitDefaults_2_1, XmlPersistenceUnitDefaults_2_3
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getTenantDiscriminatorColumns() <em>Tenant Discriminator Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTenantDiscriminatorColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlTenantDiscriminatorColumn_2_3> tenantDiscriminatorColumns;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPersistenceUnitDefaults()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_PERSISTENCE_UNIT_DEFAULTS;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitDefaults#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns()
-	{
-		if (tenantDiscriminatorColumns == null)
-		{
-			tenantDiscriminatorColumns = new EObjectContainmentEList<XmlTenantDiscriminatorColumn_2_3>(XmlTenantDiscriminatorColumn_2_3.class, this, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS);
-		}
-		return tenantDiscriminatorColumns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
-				return ((InternalEList<?>)getTenantDiscriminatorColumns()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
-				return getTenantDiscriminatorColumns();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
-				getTenantDiscriminatorColumns().clear();
-				getTenantDiscriminatorColumns().addAll((Collection<? extends XmlTenantDiscriminatorColumn_2_3>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
-				getTenantDiscriminatorColumns().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS:
-				return tenantDiscriminatorColumns != null && !tenantDiscriminatorColumns.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPersistenceUnitDefaults_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPersistenceUnitDefaults_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS;
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPersistenceUnitDefaults_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPersistenceUnitDefaults_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_3Package.XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS: return EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS__TENANT_DISCRIMINATOR_COLUMNS;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlPersistenceUnitDefaults(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildDescriptionTranslator(),
-			buildSchemaTranslator(),
-			buildCatalogTranslator(),
-			buildDelimitedIdentifiersTranslator(),
-			buildAccessTranslator(),
-			buildAccessMethodsTranslator(),
-			buildCascadePersistTranslator(),
-			buildTenantDiscriminatorColumnsTranslator(),
-			buildEntityListenersTranslator()
-		};
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildTenantDiscriminatorColumnsTranslator() {
-		return XmlTenantDiscriminatorColumn.buildTranslator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns());
-	}
-} // XmlPersistenceUnitDefaults
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java
deleted file mode 100644
index fcec1babc6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPersistenceUnitMetadata.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.EmptyTagBooleanTranslator;
-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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Persistence Unit Metadata</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.2
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata#isExcludeDefaultMappings <em>Exclude Default Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata()
- * @model kind="class"
- * @generated
- */
-public class XmlPersistenceUnitMetadata extends org.eclipse.jpt.jpa.core.resource.orm.XmlPersistenceUnitMetadata
-{
-	/**
-	 * The default value of the '{@link #isExcludeDefaultMappings() <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeDefaultMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExcludeDefaultMappings() <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExcludeDefaultMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean excludeDefaultMappings = EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPersistenceUnitMetadata()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_PERSISTENCE_UNIT_METADATA;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Exclude Default Mappings</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exclude Default Mappings</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exclude Default Mappings</em>' attribute.
-	 * @see #setExcludeDefaultMappings(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPersistenceUnitMetadata_ExcludeDefaultMappings()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isExcludeDefaultMappings()
-	{
-		return excludeDefaultMappings;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPersistenceUnitMetadata#isExcludeDefaultMappings <em>Exclude Default Mappings</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Exclude Default Mappings</em>' attribute.
-	 * @see #isExcludeDefaultMappings()
-	 * @generated
-	 */
-	public void setExcludeDefaultMappings(boolean newExcludeDefaultMappings)
-	{
-		boolean oldExcludeDefaultMappings = excludeDefaultMappings;
-		excludeDefaultMappings = newExcludeDefaultMappings;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS, oldExcludeDefaultMappings, excludeDefaultMappings));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS:
-				return isExcludeDefaultMappings();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS:
-				setExcludeDefaultMappings((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS:
-				setExcludeDefaultMappings(EXCLUDE_DEFAULT_MAPPINGS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PERSISTENCE_UNIT_METADATA__EXCLUDE_DEFAULT_MAPPINGS:
-				return excludeDefaultMappings != EXCLUDE_DEFAULT_MAPPINGS_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(" (excludeDefaultMappings: ");
-		result.append(excludeDefaultMappings);
-		result.append(')');
-		return result.toString();
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildDescriptionTranslator(),
-			buildXmlMappingMetadataCompleteTranslator(),
-			buildExcludeDefaultMappingsTranslator(),
-			XmlPersistenceUnitDefaults.buildTranslator(JPA.PERSISTENCE_UNIT_DEFAULTS, OrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata_PersistenceUnitDefaults())
-		};
-	}
-	
-	protected static Translator buildExcludeDefaultMappingsTranslator() {
-		return new EmptyTagBooleanTranslator(EclipseLink.EXCLUDE_DEFAULT_MAPPINGS, EclipseLinkOrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata_ExcludeDefaultMappings());
-	}
-}
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
deleted file mode 100644
index 49d3b010cf..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPinnedPartitioning.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Pinned Partitioning</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPinnedPartitioning()
- * @model kind="class"
- * @generated
- */
-public class XmlPinnedPartitioning extends AbstractJpaEObject implements XmlPinnedPartitioning_2_2
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPinnedPartitioning()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_PINNED_PARTITIONING;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPinnedPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPinnedPartitioning#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PINNED_PARTITIONING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PINNED_PARTITIONING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PINNED_PARTITIONING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PINNED_PARTITIONING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PINNED_PARTITIONING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlPinnedPartitioning(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator()
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlPinnedPartitioning_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlPinnedPartitioning
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
deleted file mode 100644
index 0e11f9a16e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlRecord.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Plsql Record</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlRecord()
- * @model kind="class"
- * @generated
- */
-public class XmlPlsqlRecord extends AbstractJpaEObject implements XmlPlsqlRecord_2_3
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPlsqlRecord()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_PLSQL_RECORD;
-	}
-	
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlRecord_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlRecord#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PLSQL_RECORD__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PLSQL_RECORD__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PLSQL_RECORD__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PLSQL_RECORD__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PLSQL_RECORD__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlPlsqlRecord(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink2_3.PLSQL_RECORD__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlPlsqlRecord_2_3_Name(), Translator.DOM_ATTRIBUTE);
-	}
-
-} // XmlPlsqlRecord
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
deleted file mode 100644
index 9933871f4d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPlsqlTable.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Plsql Table</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlTable()
- * @model kind="class"
- * @generated
- */
-public class XmlPlsqlTable extends AbstractJpaEObject implements XmlPlsqlTable_2_3
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPlsqlTable()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_PLSQL_TABLE;
-	}
-	
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPlsqlTable_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PLSQL_TABLE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PLSQL_TABLE__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PLSQL_TABLE__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PLSQL_TABLE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PLSQL_TABLE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlPlsqlTable(),
-			buildTranslatorChildren());
-	}
-
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink2_3.PLSQL_TABLE__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlPlsqlTable_2_3_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlPlsqlTable
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
deleted file mode 100644
index 6344aa61f3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrimaryKey.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009, 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.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;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Primary Key</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey()
- * @model kind="class"
- * @generated
- */
-public class XmlPrimaryKey extends AbstractJpaEObject implements XmlPrimaryKey_1_1, XmlPrimaryKey_2_1
-{
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final IdValidationType_1_1 VALIDATION_EDEFAULT = null;
-	
-	/**
-	 * The cached value of the '{@link #getValidation() <em>Validation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValidation()
-	 * @generated
-	 * @ordered
-	 */
-	protected IdValidationType_1_1 validation = VALIDATION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getColumns() <em>Columns</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlColumn> columns;
-
-	/**
-	 * The default value of the '{@link #getCacheKeyType() <em>Cache Key Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheKeyType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final CacheKeyType_2_1 CACHE_KEY_TYPE_EDEFAULT = CacheKeyType_2_1.ID_VALUE;
-
-	/**
-	 * The cached value of the '{@link #getCacheKeyType() <em>Cache Key Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCacheKeyType()
-	 * @generated
-	 * @ordered
-	 */
-	protected CacheKeyType_2_1 cacheKeyType = CACHE_KEY_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlPrimaryKey()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_PRIMARY_KEY;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Validation</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Validation</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Validation</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1
-	 * @see #setValidation(IdValidationType_1_1)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey_1_1_Validation()
-	 * @model
-	 * @generated
-	 */
-	public IdValidationType_1_1 getValidation()
-	{
-		return validation;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey#getValidation <em>Validation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Validation</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1
-	 * @see #getValidation()
-	 * @generated
-	 */
-	public void setValidation(IdValidationType_1_1 newValidation)
-	{
-		IdValidationType_1_1 oldValidation = validation;
-		validation = newValidation == null ? VALIDATION_EDEFAULT : newValidation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PRIMARY_KEY__VALIDATION, oldValidation, validation));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey_1_1_Columns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlColumn> getColumns()
-	{
-		if (columns == null)
-		{
-			columns = new EObjectContainmentEList<XmlColumn>(XmlColumn.class, this, EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS);
-		}
-		return columns;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Cache Key Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Key Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cache Key Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
-	 * @see #setCacheKeyType(CacheKeyType_2_1)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrimaryKey_2_1_CacheKeyType()
-	 * @model
-	 * @generated
-	 */
-	public CacheKeyType_2_1 getCacheKeyType()
-	{
-		return cacheKeyType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey#getCacheKeyType <em>Cache Key Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Key Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
-	 * @see #getCacheKeyType()
-	 * @generated
-	 */
-	public void setCacheKeyType(CacheKeyType_2_1 newCacheKeyType)
-	{
-		CacheKeyType_2_1 oldCacheKeyType = cacheKeyType;
-		cacheKeyType = newCacheKeyType == null ? CACHE_KEY_TYPE_EDEFAULT : newCacheKeyType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE, oldCacheKeyType, cacheKeyType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS:
-				return ((InternalEList<?>)getColumns()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__VALIDATION:
-				return getValidation();
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS:
-				return getColumns();
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE:
-				return getCacheKeyType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__VALIDATION:
-				setValidation((IdValidationType_1_1)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS:
-				getColumns().clear();
-				getColumns().addAll((Collection<? extends XmlColumn>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE:
-				setCacheKeyType((CacheKeyType_2_1)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__VALIDATION:
-				setValidation(VALIDATION_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS:
-				getColumns().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE:
-				setCacheKeyType(CACHE_KEY_TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__VALIDATION:
-				return validation != VALIDATION_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__COLUMNS:
-				return columns != null && !columns.isEmpty();
-			case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE:
-				return cacheKeyType != CACHE_KEY_TYPE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlPrimaryKey_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE: return EclipseLinkOrmV2_1Package.XML_PRIMARY_KEY_21__CACHE_KEY_TYPE;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlPrimaryKey_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_PRIMARY_KEY_21__CACHE_KEY_TYPE: return EclipseLinkOrmPackage.XML_PRIMARY_KEY__CACHE_KEY_TYPE;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (validation: ");
-		result.append(validation);
-		result.append(", cacheKeyType: ");
-		result.append(cacheKeyType);
-		result.append(')');
-		return result.toString();
-	}
-	
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlPrimaryKey(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildValidationTranslator(),
-			buildCacheKeyTypeTranslator(),
-			buildColumnTranslator()
-		};
-	}
-	
-	protected static Translator buildValidationTranslator() {
-		return new Translator(EclipseLink1_1.PRIMARY_KEY__VALIDATION, EclipseLinkOrmV1_1Package.eINSTANCE.getXmlPrimaryKey_1_1_Validation(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildCacheKeyTypeTranslator() {
-		return new Translator(EclipseLink2_1.CACHE_KEY_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlPrimaryKey_2_1_CacheKeyType(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildColumnTranslator() {
-		return XmlColumn.buildTranslator(EclipseLink1_1.PRIMARY_KEY__COLUMN, EclipseLinkOrmV1_1Package.eINSTANCE.getXmlPrimaryKey_1_1_Columns());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.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
deleted file mode 100644
index 98d1914012..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPrivateOwned.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Private Owned</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned#isPrivateOwned <em>Private Owned</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlPrivateOwned extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Private Owned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Private Owned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Private Owned</em>' attribute.
-	 * @see #setPrivateOwned(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned_PrivateOwned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isPrivateOwned();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrivateOwned#isPrivateOwned <em>Private Owned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Private Owned</em>' attribute.
-	 * @see #isPrivateOwned()
-	 * @generated
-	 */
-	void setPrivateOwned(boolean value);
-	
-	/**
-	 * Return the {@link TextRange} for the private-owned attibute.
-	 */
-	TextRange getPrivateOwnedTextRange();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java
deleted file mode 100644
index 7b064d3e1b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlProperty.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#getValueType <em>Value Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlProperty extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * 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 XmlProperty()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty_Value()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getValue()
-	{
-		return value;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#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, EclipseLinkOrmPackage.XML_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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlProperty_ValueType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getValueType()
-	{
-		return valueType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty#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, EclipseLinkOrmPackage.XML_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 EclipseLinkOrmPackage.XML_PROPERTY__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_PROPERTY__VALUE:
-				return getValue();
-			case EclipseLinkOrmPackage.XML_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 EclipseLinkOrmPackage.XML_PROPERTY__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_PROPERTY__VALUE:
-				setValue((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_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 EclipseLinkOrmPackage.XML_PROPERTY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_PROPERTY__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_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 EclipseLinkOrmPackage.XML_PROPERTY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_PROPERTY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case EclipseLinkOrmPackage.XML_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();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildValueTranslator(),
-			buildValueTypeTranslator(),
-		};
-	}
-	
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink.PROPERTY__NAME, EclipseLinkOrmPackage.eINSTANCE.getXmlProperty_Name(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildValueTranslator() {
-		return new Translator(EclipseLink.PROPERTY__VALUE, EclipseLinkOrmPackage.eINSTANCE.getXmlProperty_Value(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildValueTypeTranslator() {
-		return new Translator(EclipseLink.PROPERTY__VALUE_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlProperty_ValueType(), Translator.DOM_ATTRIBUTE);
-	}
-	
-} // XmlProperty
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
deleted file mode 100644
index 3eba00d2c0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlPropertyContainer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Property Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPropertyContainer#getProperties <em>Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlPropertyContainer extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlProperty> getProperties();
-
-} // XmlPropertyContainer
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
deleted file mode 100644
index 4afab0cb94..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryContainer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Query Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer#getNamedStoredProcedureQueries <em>Named Stored Procedure Queries</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlQueryContainer extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlNamedStoredProcedureQuery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryContainer_NamedStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedStoredProcedureQuery> getNamedStoredProcedureQueries();
-
-} // XmlQueryContainer
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
deleted file mode 100644
index a2b1e96876..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlQueryRedirectors.java
+++ /dev/null
@@ -1,654 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Query Redirectors</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors()
- * @model kind="class"
- * @generated
- */
-public class XmlQueryRedirectors extends AbstractJpaEObject implements XmlQueryRedirectors_2_0
-{
-	/**
-	 * The default value of the '{@link #getAllQueries() <em>All Queries</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAllQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ALL_QUERIES_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAllQueries() <em>All Queries</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAllQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected String allQueries = ALL_QUERIES_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getReadAll() <em>Read All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadAll()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String READ_ALL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReadAll() <em>Read All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadAll()
-	 * @generated
-	 * @ordered
-	 */
-	protected String readAll = READ_ALL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getReadObject() <em>Read Object</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadObject()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String READ_OBJECT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReadObject() <em>Read Object</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadObject()
-	 * @generated
-	 * @ordered
-	 */
-	protected String readObject = READ_OBJECT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getReport() <em>Report</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REPORT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReport() <em>Report</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReport()
-	 * @generated
-	 * @ordered
-	 */
-	protected String report = REPORT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUpdate() <em>Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String UPDATE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUpdate() <em>Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUpdate()
-	 * @generated
-	 * @ordered
-	 */
-	protected String update = UPDATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getInsert() <em>Insert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInsert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String INSERT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInsert() <em>Insert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInsert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String insert = INSERT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDelete() <em>Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DELETE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDelete() <em>Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected String delete = DELETE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlQueryRedirectors()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_QUERY_REDIRECTORS;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>All Queries</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>All Queries</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>All Queries</em>' attribute.
-	 * @see #setAllQueries(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_AllQueries()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAllQueries()
-	{
-		return allQueries;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors#getAllQueries <em>All Queries</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>All Queries</em>' attribute.
-	 * @see #getAllQueries()
-	 * @generated
-	 */
-	public void setAllQueries(String newAllQueries)
-	{
-		String oldAllQueries = allQueries;
-		allQueries = newAllQueries;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__ALL_QUERIES, oldAllQueries, allQueries));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Read All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read All</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 All</em>' attribute.
-	 * @see #setReadAll(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_ReadAll()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getReadAll()
-	{
-		return readAll;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors#getReadAll <em>Read All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read All</em>' attribute.
-	 * @see #getReadAll()
-	 * @generated
-	 */
-	public void setReadAll(String newReadAll)
-	{
-		String oldReadAll = readAll;
-		readAll = newReadAll;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_ALL, oldReadAll, readAll));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Read Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read Object</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 Object</em>' attribute.
-	 * @see #setReadObject(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_ReadObject()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getReadObject()
-	{
-		return readObject;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors#getReadObject <em>Read Object</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Object</em>' attribute.
-	 * @see #getReadObject()
-	 * @generated
-	 */
-	public void setReadObject(String newReadObject)
-	{
-		String oldReadObject = readObject;
-		readObject = newReadObject;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_OBJECT, oldReadObject, readObject));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Report</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Report</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Report</em>' attribute.
-	 * @see #setReport(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_Report()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getReport()
-	{
-		return report;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors#getReport <em>Report</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Report</em>' attribute.
-	 * @see #getReport()
-	 * @generated
-	 */
-	public void setReport(String newReport)
-	{
-		String oldReport = report;
-		report = newReport;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__REPORT, oldReport, report));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Update</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Update</em>' attribute.
-	 * @see #setUpdate(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_Update()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getUpdate()
-	{
-		return update;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors#getUpdate <em>Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Update</em>' attribute.
-	 * @see #getUpdate()
-	 * @generated
-	 */
-	public void setUpdate(String newUpdate)
-	{
-		String oldUpdate = update;
-		update = newUpdate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__UPDATE, oldUpdate, update));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Insert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Insert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Insert</em>' attribute.
-	 * @see #setInsert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_Insert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getInsert()
-	{
-		return insert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors#getInsert <em>Insert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Insert</em>' attribute.
-	 * @see #getInsert()
-	 * @generated
-	 */
-	public void setInsert(String newInsert)
-	{
-		String oldInsert = insert;
-		insert = newInsert;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__INSERT, oldInsert, insert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delete</em>' attribute.
-	 * @see #setDelete(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlQueryRedirectors_2_0_Delete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDelete()
-	{
-		return delete;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors#getDelete <em>Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delete</em>' attribute.
-	 * @see #getDelete()
-	 * @generated
-	 */
-	public void setDelete(String newDelete)
-	{
-		String oldDelete = delete;
-		delete = newDelete;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__DELETE, oldDelete, delete));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__ALL_QUERIES:
-				return getAllQueries();
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_ALL:
-				return getReadAll();
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_OBJECT:
-				return getReadObject();
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__REPORT:
-				return getReport();
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__UPDATE:
-				return getUpdate();
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__INSERT:
-				return getInsert();
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__DELETE:
-				return getDelete();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__ALL_QUERIES:
-				setAllQueries((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_ALL:
-				setReadAll((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_OBJECT:
-				setReadObject((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__REPORT:
-				setReport((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__UPDATE:
-				setUpdate((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__INSERT:
-				setInsert((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__DELETE:
-				setDelete((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__ALL_QUERIES:
-				setAllQueries(ALL_QUERIES_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_ALL:
-				setReadAll(READ_ALL_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_OBJECT:
-				setReadObject(READ_OBJECT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__REPORT:
-				setReport(REPORT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__UPDATE:
-				setUpdate(UPDATE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__INSERT:
-				setInsert(INSERT_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__DELETE:
-				setDelete(DELETE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__ALL_QUERIES:
-				return ALL_QUERIES_EDEFAULT == null ? allQueries != null : !ALL_QUERIES_EDEFAULT.equals(allQueries);
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_ALL:
-				return READ_ALL_EDEFAULT == null ? readAll != null : !READ_ALL_EDEFAULT.equals(readAll);
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__READ_OBJECT:
-				return READ_OBJECT_EDEFAULT == null ? readObject != null : !READ_OBJECT_EDEFAULT.equals(readObject);
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__REPORT:
-				return REPORT_EDEFAULT == null ? report != null : !REPORT_EDEFAULT.equals(report);
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__UPDATE:
-				return UPDATE_EDEFAULT == null ? update != null : !UPDATE_EDEFAULT.equals(update);
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__INSERT:
-				return INSERT_EDEFAULT == null ? insert != null : !INSERT_EDEFAULT.equals(insert);
-			case EclipseLinkOrmPackage.XML_QUERY_REDIRECTORS__DELETE:
-				return DELETE_EDEFAULT == null ? delete != null : !DELETE_EDEFAULT.equals(delete);
-		}
-		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(" (allQueries: ");
-		result.append(allQueries);
-		result.append(", readAll: ");
-		result.append(readAll);
-		result.append(", readObject: ");
-		result.append(readObject);
-		result.append(", report: ");
-		result.append(report);
-		result.append(", update: ");
-		result.append(update);
-		result.append(", insert: ");
-		result.append(insert);
-		result.append(", delete: ");
-		result.append(delete);
-		result.append(')');
-		return result.toString();
-	}
-	
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName,
-			structuralFeature,
-			Translator.END_TAG_NO_INDENT,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlQueryRedirectors(),
-			buildTranslatorChildren()
-		);
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildAllQueriesTranslator(),
-			buildReadAllTranslator(),
-			buildReadObjectTranslator(),
-			buildReportTranslator(),
-			buildUpdateTranslator(),
-			buildInsertTranslator(),
-			buildDeleteTranslator(),
-		};
-	}
-	
-	protected static Translator buildAllQueriesTranslator() {
-		return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__ALL_QUERIES, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildReadAllTranslator() {
-		return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__READ_ALL, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_ReadAll(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildReadObjectTranslator() {
-		return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__READ_OBJECT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_ReadObject(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildReportTranslator() {
-		return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__REPORT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildUpdateTranslator() {
-		return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__UPDATE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildInsertTranslator() {
-		return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__INSERT, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildDeleteTranslator() {
-		return new Translator(EclipseLink2_0.QUERY_REDIRECTORS__DELETE, EclipseLinkOrmV2_0Package.eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlQueryRedirectors
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
deleted file mode 100644
index b168ad07ef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRangePartitioning.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Range Partitioning</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRangePartitioning()
- * @model kind="class"
- * @generated
- */
-public class XmlRangePartitioning extends AbstractJpaEObject implements XmlRangePartitioning_2_2
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlRangePartitioning()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_RANGE_PARTITIONING;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRangePartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRangePartitioning#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_RANGE_PARTITIONING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_RANGE_PARTITIONING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_RANGE_PARTITIONING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_RANGE_PARTITIONING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_RANGE_PARTITIONING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlRangePartitioning(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator()
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlRangePartitioning_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlRangePartitioning
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
deleted file mode 100644
index b4f928abf0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReadOnly.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm;
-
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Read Only</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly#getReadOnly <em>Read Only</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlReadOnly extends JpaEObject
-{
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReadOnly_ReadOnly()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getReadOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReadOnly#getReadOnly <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Only</em>' attribute.
-	 * @see #getReadOnly()
-	 * @generated
-	 */
-	void setReadOnly(Boolean value);
-	
-	/**
-	 * Return the {@link TextRange} for the read-only attibute.
-	 */
-	TextRange getReadOnlyTextRange();
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java
deleted file mode 100644
index 14607841ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReplicationPartitioning.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Replication Partitioning</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReplicationPartitioning()
- * @model kind="class"
- * @generated
- */
-public class XmlReplicationPartitioning extends AbstractJpaEObject implements XmlReplicationPartitioning_2_2
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlReplicationPartitioning()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_REPLICATION_PARTITIONING;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReplicationPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReplicationPartitioning#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_REPLICATION_PARTITIONING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_REPLICATION_PARTITIONING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_REPLICATION_PARTITIONING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_REPLICATION_PARTITIONING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_REPLICATION_PARTITIONING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlReplicationPartitioning(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-		};
-	}
-	
-	protected static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlReplicationPartitioning_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlReplicationPartitioning
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
deleted file mode 100644
index 0762f0007a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlReturnInsert.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.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.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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Return Insert</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert()
- * @model kind="class"
- * @generated
- */
-public class XmlReturnInsert extends AbstractJpaEObject implements XmlReturnInsert_2_1
-{
-	/**
-	 * The default value of the '{@link #getReturnOnly() <em>Return Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean RETURN_ONLY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getReturnOnly() <em>Return Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean returnOnly = RETURN_ONLY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlReturnInsert()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_RETURN_INSERT;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Return Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Only</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Only</em>' attribute.
-	 * @see #setReturnOnly(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlReturnInsert_2_1_ReturnOnly()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getReturnOnly()
-	{
-		return returnOnly;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert#getReturnOnly <em>Return Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Only</em>' attribute.
-	 * @see #getReturnOnly()
-	 * @generated
-	 */
-	public void setReturnOnly(Boolean newReturnOnly)
-	{
-		Boolean oldReturnOnly = returnOnly;
-		returnOnly = newReturnOnly;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY, oldReturnOnly, returnOnly));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY:
-				return getReturnOnly();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY:
-				setReturnOnly((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY:
-				setReturnOnly(RETURN_ONLY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_RETURN_INSERT__RETURN_ONLY:
-				return RETURN_ONLY_EDEFAULT == null ? returnOnly != null : !RETURN_ONLY_EDEFAULT.equals(returnOnly);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (returnOnly: ");
-		result.append(returnOnly);
-		result.append(')');
-		return result.toString();
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildReturnOnlyTranslator()};
-	}
-	
-	protected static Translator buildReturnOnlyTranslator() {
-		return new Translator(EclipseLink2_1.RETURN_ONLY, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlReturnInsert_2_1_ReturnOnly());
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.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
deleted file mode 100644
index d67d354ab8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlRoundRobinPartitioning.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Round Robin Partitioning</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRoundRobinPartitioning()
- * @model kind="class"
- * @generated
- */
-public class XmlRoundRobinPartitioning extends AbstractJpaEObject implements XmlRoundRobinPartitioning_2_2
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlRoundRobinPartitioning()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_ROUND_ROBIN_PARTITIONING;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlRoundRobinPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlRoundRobinPartitioning#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_ROUND_ROBIN_PARTITIONING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ROUND_ROBIN_PARTITIONING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ROUND_ROBIN_PARTITIONING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ROUND_ROBIN_PARTITIONING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_ROUND_ROBIN_PARTITIONING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlRoundRobinPartitioning(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator()
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlRoundRobinPartitioning_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlRoundRobinPartitioning
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
deleted file mode 100644
index 502d043f47..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlSecondaryTable.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Secondary Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlSecondaryTable()
- * @model kind="class"
- * @generated
- */
-public class XmlSecondaryTable extends org.eclipse.jpt.jpa.core.resource.orm.XmlSecondaryTable implements XmlSecondaryTable_2_2
-{
-	/**
-	 * The default value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CREATION_SUFFIX_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected String creationSuffix = CREATION_SUFFIX_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlSecondaryTable()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_SECONDARY_TABLE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlSecondaryTable_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCreationSuffix()
-	{
-		return creationSuffix;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlSecondaryTable#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	public void setCreationSuffix(String newCreationSuffix)
-	{
-		String oldCreationSuffix = creationSuffix;
-		creationSuffix = newCreationSuffix;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_SECONDARY_TABLE__CREATION_SUFFIX, oldCreationSuffix, creationSuffix));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_SECONDARY_TABLE__CREATION_SUFFIX:
-				return getCreationSuffix();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_SECONDARY_TABLE__CREATION_SUFFIX:
-				setCreationSuffix((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_SECONDARY_TABLE__CREATION_SUFFIX:
-				setCreationSuffix(CREATION_SUFFIX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_SECONDARY_TABLE__CREATION_SUFFIX:
-				return CREATION_SUFFIX_EDEFAULT == null ? creationSuffix != null : !CREATION_SUFFIX_EDEFAULT.equals(creationSuffix);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlSecondaryTable_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_SECONDARY_TABLE__CREATION_SUFFIX: return EclipseLinkOrmV2_2Package.XML_SECONDARY_TABLE_22__CREATION_SUFFIX;
-				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 == XmlSecondaryTable_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_SECONDARY_TABLE_22__CREATION_SUFFIX: return EclipseLinkOrmPackage.XML_SECONDARY_TABLE__CREATION_SUFFIX;
-				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(" (creationSuffix: ");
-		result.append(creationSuffix);
-		result.append(')');
-		return result.toString();
-	}
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlSecondaryTable(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildCatalogTranslator(),
-			buildSchemaTranslator(),
-			buildCreationSuffixTranslator(),
-			buildPrimaryKeyJoinColumnsTranslator(),
-			buildUniqueConstraintTranslator()
-		};
-	}
-
-	protected static Translator buildCreationSuffixTranslator() {
-		return new Translator(EclipseLink2_2.CREATION_SUFFIX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlSecondaryTable_2_2_CreationSuffix(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlSecondaryTable
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
deleted file mode 100644
index 4c219d0fc0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStoredProcedureParameter.java
+++ /dev/null
@@ -1,590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Stored Procedure Parameter</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.2
- * @since 2.2
- *
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getDirection <em>Direction</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getQueryParameter <em>Query Parameter</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcType <em>Jdbc Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcTypeName <em>Jdbc Type Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlStoredProcedureParameter extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * changed this to null and removed the generated flag so emf won't generate over it
-	 * we don't want a default for enums, just null if the tag does not exist
-	 */
-	protected static final XmlDirection DIRECTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDirection()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlDirection direction = DIRECTION_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 #getQueryParameter() <em>Query Parameter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueryParameter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUERY_PARAMETER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQueryParameter() <em>Query Parameter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueryParameter()
-	 * @generated
-	 * @ordered
-	 */
-	protected String queryParameter = QUERY_PARAMETER_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 #getJdbcType() <em>Jdbc Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJdbcType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer JDBC_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJdbcType() <em>Jdbc Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJdbcType()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer jdbcType = JDBC_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJdbcTypeName() <em>Jdbc Type Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJdbcTypeName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JDBC_TYPE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJdbcTypeName() <em>Jdbc Type Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJdbcTypeName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String jdbcTypeName = JDBC_TYPE_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlStoredProcedureParameter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_STORED_PROCEDURE_PARAMETER;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Direction</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Direction</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Direction</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection
-	 * @see #setDirection(XmlDirection)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_Direction()
-	 * @model
-	 * @generated
-	 */
-	public XmlDirection getDirection()
-	{
-		return direction;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getDirection <em>Direction</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Direction</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlDirection
-	 * @see #getDirection()
-	 * @generated
-	 */
-	public void setDirection(XmlDirection newDirection)
-	{
-		XmlDirection oldDirection = direction;
-		direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION, oldDirection, direction));
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME, oldName, name));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Query Parameter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query Parameter</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query Parameter</em>' attribute.
-	 * @see #setQueryParameter(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_QueryParameter()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getQueryParameter()
-	{
-		return queryParameter;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getQueryParameter <em>Query Parameter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query Parameter</em>' attribute.
-	 * @see #getQueryParameter()
-	 * @generated
-	 */
-	public void setQueryParameter(String newQueryParameter)
-	{
-		String oldQueryParameter = queryParameter;
-		queryParameter = newQueryParameter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER, oldQueryParameter, queryParameter));
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_Type()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#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, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__TYPE, oldType, type));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Jdbc Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jdbc 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>Jdbc Type</em>' attribute.
-	 * @see #setJdbcType(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_JdbcType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getJdbcType()
-	{
-		return jdbcType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcType <em>Jdbc Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jdbc Type</em>' attribute.
-	 * @see #getJdbcType()
-	 * @generated
-	 */
-	public void setJdbcType(Integer newJdbcType)
-	{
-		Integer oldJdbcType = jdbcType;
-		jdbcType = newJdbcType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE, oldJdbcType, jdbcType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Jdbc Type Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jdbc Type 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>Jdbc Type Name</em>' attribute.
-	 * @see #setJdbcTypeName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStoredProcedureParameter_JdbcTypeName()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getJdbcTypeName()
-	{
-		return jdbcTypeName;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStoredProcedureParameter#getJdbcTypeName <em>Jdbc Type Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jdbc Type Name</em>' attribute.
-	 * @see #getJdbcTypeName()
-	 * @generated
-	 */
-	public void setJdbcTypeName(String newJdbcTypeName)
-	{
-		String oldJdbcTypeName = jdbcTypeName;
-		jdbcTypeName = newJdbcTypeName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE_NAME, oldJdbcTypeName, jdbcTypeName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION:
-				return getDirection();
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER:
-				return getQueryParameter();
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__TYPE:
-				return getType();
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE:
-				return getJdbcType();
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE_NAME:
-				return getJdbcTypeName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION:
-				setDirection((XmlDirection)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER:
-				setQueryParameter((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__TYPE:
-				setType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE:
-				setJdbcType((Integer)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE_NAME:
-				setJdbcTypeName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION:
-				setDirection(DIRECTION_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER:
-				setQueryParameter(QUERY_PARAMETER_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE:
-				setJdbcType(JDBC_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE_NAME:
-				setJdbcTypeName(JDBC_TYPE_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__DIRECTION:
-				return direction != DIRECTION_EDEFAULT;
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__QUERY_PARAMETER:
-				return QUERY_PARAMETER_EDEFAULT == null ? queryParameter != null : !QUERY_PARAMETER_EDEFAULT.equals(queryParameter);
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE:
-				return JDBC_TYPE_EDEFAULT == null ? jdbcType != null : !JDBC_TYPE_EDEFAULT.equals(jdbcType);
-			case EclipseLinkOrmPackage.XML_STORED_PROCEDURE_PARAMETER__JDBC_TYPE_NAME:
-				return JDBC_TYPE_NAME_EDEFAULT == null ? jdbcTypeName != null : !JDBC_TYPE_NAME_EDEFAULT.equals(jdbcTypeName);
-		}
-		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(" (direction: ");
-		result.append(direction);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", queryParameter: ");
-		result.append(queryParameter);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", jdbcType: ");
-		result.append(jdbcType);
-		result.append(", jdbcTypeName: ");
-		result.append(jdbcTypeName);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildDirectionTranslator(),
-			buildNameTranslator(),
-			buildQueryParameterTranslator(),
-			buildTypeTranslator(),
-			buildJdbcTypeTranslator(),
-			buildJdbcTypeNameTranslator(),
-		};
-	}
-	
-	protected static Translator buildDirectionTranslator() {
-		return new Translator(EclipseLink.PARAMETER__DIRECTION, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_Direction(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink.PARAMETER__NAME, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_Name(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildQueryParameterTranslator() {
-		return new Translator(EclipseLink.PARAMETER__QUERY_PARAMETER, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_QueryParameter(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildTypeTranslator() {
-		return new Translator(EclipseLink.PARAMETER__TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_Type(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildJdbcTypeTranslator() {
-		return new Translator(EclipseLink.PARAMETER__JDBC_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_JdbcType(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildJdbcTypeNameTranslator() {
-		return new Translator(EclipseLink.PARAMETER__JDBC_TYPE_NAME, EclipseLinkOrmPackage.eINSTANCE.getXmlStoredProcedureParameter_JdbcTypeName(), Translator.DOM_ATTRIBUTE);
-	}
-	
-} // XmlStoredProcedureParameter
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
deleted file mode 100644
index 498236b916..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStruct.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.jpa.core.resource.xml.AbstractJpaEObject;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLink2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Struct</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStruct()
- * @model kind="class"
- * @generated
- */
-public class XmlStruct extends AbstractJpaEObject implements XmlStruct_2_3
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlStruct()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_STRUCT;
-	}
-	
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStruct_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStruct#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STRUCT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlStruct(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(EclipseLink2_3.STRUCT__NAME, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlStruct_2_3_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlStruct
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStructConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStructConverter.java
deleted file mode 100644
index b7028939fb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStructConverter.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.jdt.core.IType;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Struct CustomConverter</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter#getConverter <em>Converter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
- * @model kind="class"
- * @generated
- */
-public class XmlStructConverter extends XmlNamedConverter
-{
-	/**
-	 * The default value of the '{@link #getConverter() <em>Converter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONVERTER_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected String converter = CONVERTER_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlStructConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_STRUCT_CONVERTER;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>CustomConverter</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Converter</em>' attribute.
-	 * @see #setConverter(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter_Converter()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getConverter()
-	{
-		return converter;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructConverter#getConverter <em>Converter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter</em>' attribute.
-	 * @see #getConverter()
-	 * @generated
-	 */
-	public void setConverter(String newConverter)
-	{
-		String oldConverter = converter;
-		converter = newConverter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER, oldConverter, converter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER:
-				return getConverter();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER:
-				setConverter((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER:
-				setConverter(CONVERTER_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER:
-				return CONVERTER_EDEFAULT == null ? converter != null : !CONVERTER_EDEFAULT.equals(converter);
-		}
-		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(" (converter: ");
-		result.append(converter);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getConverterClassTextRange() {
-		return getAttributeTextRange(EclipseLink.STRUCT_CONVERTER__CONVERTER);
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName,
-			structuralFeature,
-			Translator.END_TAG_NO_INDENT,
-			buildTranslatorChildren()
-		);
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildConverterTranslator()
-		};
-	}
-	
-	protected static Translator buildConverterTranslator() {
-		return new Translator(EclipseLink.STRUCT_CONVERTER__CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlStructConverter_Converter(), Translator.DOM_ATTRIBUTE);
-	}
-
-
-	// ********** refactoring **********
-
-	public ReplaceEdit createRenameEdit(IType originalType, String newName) {
-		String originalName = originalType.getTypeQualifiedName();
-		int nameIndex = this.converter.lastIndexOf(originalName);
-		int offset = getAttributeNode(EclipseLink.STRUCT_CONVERTER__CONVERTER).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
-	}
-
-	public ReplaceEdit createRenamePackageEdit(String newName) {
-		int packageLength = this.converter.lastIndexOf('.');
-		if (packageLength == -1) {
-			packageLength = 0;
-			newName = newName + '.';
-		}
-		int offset = getAttributeNode(EclipseLink.STRUCT_CONVERTER__CONVERTER).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset, packageLength, newName);
-	}
-} // XmlStructConverter
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStructure.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStructure.java
deleted file mode 100644
index 01df4c7221..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlStructure.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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;
-import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_3.EclipseLinkMappingKeys2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Structure</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructure()
- * @model kind="class"
- * @generated
- */
-public class XmlStructure extends AbstractXmlAttributeMapping implements XmlAttributeMapping, XmlStructure_2_3
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlStructure()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_STRUCTURE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_STRUCTURE__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_STRUCTURE__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_STRUCTURE__PROPERTIES:
-				return getProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_STRUCTURE__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_STRUCTURE__PROPERTIES:
-				getProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_STRUCTURE__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_STRUCTURE__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlStructure_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_STRUCTURE__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_STRUCTURE__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlStructure_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys2_3.STRUCTURE_ATTRIBUTE_MAPPING_KEY;
-	}
-
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlStructure(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator()
-		};
-	}
-
-} // XmlStructure
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
deleted file mode 100644
index 33d9d07657..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTable.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Table</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTable()
- * @model kind="class"
- * @generated
- */
-public class XmlTable extends org.eclipse.jpt.jpa.core.resource.orm.XmlTable implements XmlTable_2_2
-{
-	/**
-	 * The default value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CREATION_SUFFIX_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected String creationSuffix = CREATION_SUFFIX_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTable()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TABLE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTable_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCreationSuffix()
-	{
-		return creationSuffix;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTable#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	public void setCreationSuffix(String newCreationSuffix)
-	{
-		String oldCreationSuffix = creationSuffix;
-		creationSuffix = newCreationSuffix;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TABLE__CREATION_SUFFIX, oldCreationSuffix, creationSuffix));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TABLE__CREATION_SUFFIX:
-				return getCreationSuffix();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TABLE__CREATION_SUFFIX:
-				setCreationSuffix((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TABLE__CREATION_SUFFIX:
-				setCreationSuffix(CREATION_SUFFIX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TABLE__CREATION_SUFFIX:
-				return CREATION_SUFFIX_EDEFAULT == null ? creationSuffix != null : !CREATION_SUFFIX_EDEFAULT.equals(creationSuffix);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlTable_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TABLE__CREATION_SUFFIX: return EclipseLinkOrmV2_2Package.XML_TABLE_22__CREATION_SUFFIX;
-				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 == XmlTable_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_TABLE_22__CREATION_SUFFIX: return EclipseLinkOrmPackage.XML_TABLE__CREATION_SUFFIX;
-				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(" (creationSuffix: ");
-		result.append(creationSuffix);
-		result.append(')');
-		return result.toString();
-	}
-
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlTable(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildCatalogTranslator(),
-			buildSchemaTranslator(),
-			buildCreationSuffixTranslator(),
-			buildUniqueConstraintTranslator()
-		};
-	}
-
-	protected static Translator buildCreationSuffixTranslator() {
-		return new Translator(EclipseLink2_2.CREATION_SUFFIX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlTable_2_2_CreationSuffix(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlTable
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
deleted file mode 100644
index a314c639bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTableGenerator.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlUniqueConstraint;
-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.XmlTableGenerator_2_2;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * 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.
- * A representation of the model object '<em><b>Xml Table Generator</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTableGenerator()
- * @model kind="class"
- * @generated
- */
-public class XmlTableGenerator extends org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator implements XmlTableGenerator_2_2
-{
-	/**
-	 * The default value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CREATION_SUFFIX_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCreationSuffix() <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationSuffix()
-	 * @generated
-	 * @ordered
-	 */
-	protected String creationSuffix = CREATION_SUFFIX_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTableGenerator()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TABLE_GENERATOR;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTableGenerator_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getCreationSuffix()
-	{
-		return creationSuffix;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTableGenerator#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	public void setCreationSuffix(String newCreationSuffix)
-	{
-		String oldCreationSuffix = creationSuffix;
-		creationSuffix = newCreationSuffix;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TABLE_GENERATOR__CREATION_SUFFIX, oldCreationSuffix, creationSuffix));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TABLE_GENERATOR__CREATION_SUFFIX:
-				return getCreationSuffix();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TABLE_GENERATOR__CREATION_SUFFIX:
-				setCreationSuffix((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TABLE_GENERATOR__CREATION_SUFFIX:
-				setCreationSuffix(CREATION_SUFFIX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TABLE_GENERATOR__CREATION_SUFFIX:
-				return CREATION_SUFFIX_EDEFAULT == null ? creationSuffix != null : !CREATION_SUFFIX_EDEFAULT.equals(creationSuffix);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlTableGenerator_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TABLE_GENERATOR__CREATION_SUFFIX: return EclipseLinkOrmV2_2Package.XML_TABLE_GENERATOR_22__CREATION_SUFFIX;
-				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 == XmlTableGenerator_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_TABLE_GENERATOR_22__CREATION_SUFFIX: return EclipseLinkOrmPackage.XML_TABLE_GENERATOR__CREATION_SUFFIX;
-				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(" (creationSuffix: ");
-		result.append(creationSuffix);
-		result.append(')');
-		return result.toString();
-	}
-
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlTableGenerator(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildTableTranslator(),
-			buildCatalogTranslator(),
-			buildSchemaTranslator(),
-			buildCreationSuffixTranslator(),
-			buildPkColumnNameTranslator(),
-			buildValueColumnNameTranslator(),
-			buildPkColumnValueTranslator(),
-			buildInitialValueTranslator(),
-			buildAllocationSizeTranslator(),
-			buildDescriptionTranslator(),
-			XmlUniqueConstraint.buildTranslator(JPA.UNIQUE_CONSTRAINT, OrmPackage.eINSTANCE.getXmlTableGenerator_UniqueConstraints())
-		};
-	}
-
-	protected static Translator buildCreationSuffixTranslator() {
-		return new Translator(EclipseLink2_2.CREATION_SUFFIX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlTableGenerator_2_2_CreationSuffix(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlTableGenerator
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java
deleted file mode 100644
index 99ce6effba..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantDiscriminatorColumn.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.AbstractXmlBaseDiscriminatorColumn;
-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.XmlTenantDiscriminatorColumn_2_3;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Tenant Discriminator</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn()
- * @model kind="class"
- * @generated
- */
-public class XmlTenantDiscriminatorColumn extends AbstractXmlBaseDiscriminatorColumn implements XmlTenantDiscriminatorColumn_2_3
-{
-	/**
-	 * The default value of the '{@link #getContextProperty() <em>Context Property</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextProperty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONTEXT_PROPERTY_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getContextProperty() <em>Context Property</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextProperty()
-	 * @generated
-	 * @ordered
-	 */
-	protected String contextProperty = CONTEXT_PROPERTY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TABLE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getTable() <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTable()
-	 * @generated
-	 * @ordered
-	 */
-	protected String table = TABLE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getPrimaryKey() <em>Primary Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimaryKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean PRIMARY_KEY_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getPrimaryKey() <em>Primary Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimaryKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean primaryKey = PRIMARY_KEY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTenantDiscriminatorColumn()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TENANT_DISCRIMINATOR_COLUMN;
-	}
-	/**
-	 * Returns the value of the '<em><b>Context Property</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Property</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Context Property</em>' attribute.
-	 * @see #setContextProperty(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn_2_3_ContextProperty()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getContextProperty()
-	{
-		return contextProperty;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn#getContextProperty <em>Context Property</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context Property</em>' attribute.
-	 * @see #getContextProperty()
-	 * @generated
-	 */
-	public void setContextProperty(String newContextProperty)
-	{
-		String oldContextProperty = contextProperty;
-		contextProperty = newContextProperty;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY, oldContextProperty, contextProperty));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' attribute.
-	 * @see #setTable(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn_2_3_Table()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getTable()
-	{
-		return table;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
-	 * @see #getTable()
-	 * @generated
-	 */
-	public void setTable(String newTable)
-	{
-		String oldTable = table;
-		table = newTable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__TABLE, oldTable, table));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary 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>Primary Key</em>' attribute.
-	 * @see #setPrimaryKey(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTenantDiscriminatorColumn_2_3_PrimaryKey()
-	 * @model
-	 * @generated
-	 */
-	public Boolean getPrimaryKey()
-	{
-		return primaryKey;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTenantDiscriminatorColumn#getPrimaryKey <em>Primary Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key</em>' attribute.
-	 * @see #getPrimaryKey()
-	 * @generated
-	 */
-	public void setPrimaryKey(Boolean newPrimaryKey)
-	{
-		Boolean oldPrimaryKey = primaryKey;
-		primaryKey = newPrimaryKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY, oldPrimaryKey, primaryKey));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY:
-				return getContextProperty();
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__TABLE:
-				return getTable();
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY:
-				return getPrimaryKey();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY:
-				setContextProperty((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__TABLE:
-				setTable((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY:
-				setPrimaryKey((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY:
-				setContextProperty(CONTEXT_PROPERTY_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__TABLE:
-				setTable(TABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY:
-				setPrimaryKey(PRIMARY_KEY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY:
-				return CONTEXT_PROPERTY_EDEFAULT == null ? contextProperty != null : !CONTEXT_PROPERTY_EDEFAULT.equals(contextProperty);
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__TABLE:
-				return TABLE_EDEFAULT == null ? table != null : !TABLE_EDEFAULT.equals(table);
-			case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY:
-				return PRIMARY_KEY_EDEFAULT == null ? primaryKey != null : !PRIMARY_KEY_EDEFAULT.equals(primaryKey);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlTenantDiscriminatorColumn_2_3.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY: return EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23__CONTEXT_PROPERTY;
-				case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__TABLE: return EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23__TABLE;
-				case EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY: return EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23__PRIMARY_KEY;
-				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 == XmlTenantDiscriminatorColumn_2_3.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23__CONTEXT_PROPERTY: return EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY;
-				case EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23__TABLE: return EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__TABLE;
-				case EclipseLinkOrmV2_3Package.XML_TENANT_DISCRIMINATOR_COLUMN_23__PRIMARY_KEY: return EclipseLinkOrmPackage.XML_TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY;
-				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(" (contextProperty: ");
-		result.append(contextProperty);
-		result.append(", table: ");
-		result.append(table);
-		result.append(", primaryKey: ");
-		result.append(primaryKey);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName,
-			structuralFeature,
-			Translator.END_TAG_NO_INDENT,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlTenantDiscriminatorColumn(),
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildContextPropertyTranslator(),
-			buildDiscriminatorTypeTranslator(),
-			buildColumnDefinitionTranslator(),
-			buildLengthTranslator(),
-			buildTableTranslator(),
-			buildPrimaryKeyTranslator()
-		};
-	}
-
-	protected static Translator buildContextPropertyTranslator() {
-		return new Translator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_ContextProperty(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildTableTranslator() {
-		return new Translator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__TABLE, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_Table(), Translator.DOM_ATTRIBUTE);
-	}
-
-	protected static Translator buildPrimaryKeyTranslator() {
-		return new Translator(EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY, EclipseLinkOrmV2_3Package.eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_PrimaryKey(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlTenantDiscriminator
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
deleted file mode 100644
index ea0c735488..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTimeOfDay.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.jpa.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.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Time Of Day</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getHour <em>Hour</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getMinute <em>Minute</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getSecond <em>Second</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getMillisecond <em>Millisecond</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay()
- * @model kind="class"
- * @extends JpaEObject
- * @generated
- */
-public class XmlTimeOfDay extends AbstractJpaEObject implements JpaEObject
-{
-	/**
-	 * The default value of the '{@link #getHour() <em>Hour</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHour()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer HOUR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHour() <em>Hour</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHour()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer hour = HOUR_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMinute() <em>Minute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinute()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer MINUTE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMinute() <em>Minute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinute()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer minute = MINUTE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSecond() <em>Second</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecond()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer SECOND_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSecond() <em>Second</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSecond()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer second = SECOND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMillisecond() <em>Millisecond</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMillisecond()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer MILLISECOND_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMillisecond() <em>Millisecond</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMillisecond()
-	 * @generated
-	 * @ordered
-	 */
-	protected Integer millisecond = MILLISECOND_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTimeOfDay()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TIME_OF_DAY;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hour</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hour</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Hour</em>' attribute.
-	 * @see #setHour(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay_Hour()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getHour()
-	{
-		return hour;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getHour <em>Hour</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hour</em>' attribute.
-	 * @see #getHour()
-	 * @generated
-	 */
-	public void setHour(Integer newHour)
-	{
-		Integer oldHour = hour;
-		hour = newHour;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TIME_OF_DAY__HOUR, oldHour, hour));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Minute</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Minute</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Minute</em>' attribute.
-	 * @see #setMinute(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay_Minute()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getMinute()
-	{
-		return minute;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getMinute <em>Minute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minute</em>' attribute.
-	 * @see #getMinute()
-	 * @generated
-	 */
-	public void setMinute(Integer newMinute)
-	{
-		Integer oldMinute = minute;
-		minute = newMinute;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TIME_OF_DAY__MINUTE, oldMinute, minute));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' attribute.
-	 * @see #setSecond(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay_Second()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getSecond()
-	{
-		return second;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getSecond <em>Second</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' attribute.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	public void setSecond(Integer newSecond)
-	{
-		Integer oldSecond = second;
-		second = newSecond;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TIME_OF_DAY__SECOND, oldSecond, second));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Millisecond</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Millisecond</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Millisecond</em>' attribute.
-	 * @see #setMillisecond(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTimeOfDay_Millisecond()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	public Integer getMillisecond()
-	{
-		return millisecond;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTimeOfDay#getMillisecond <em>Millisecond</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Millisecond</em>' attribute.
-	 * @see #getMillisecond()
-	 * @generated
-	 */
-	public void setMillisecond(Integer newMillisecond)
-	{
-		Integer oldMillisecond = millisecond;
-		millisecond = newMillisecond;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TIME_OF_DAY__MILLISECOND, oldMillisecond, millisecond));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__HOUR:
-				return getHour();
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__MINUTE:
-				return getMinute();
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__SECOND:
-				return getSecond();
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__MILLISECOND:
-				return getMillisecond();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__HOUR:
-				setHour((Integer)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__MINUTE:
-				setMinute((Integer)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__SECOND:
-				setSecond((Integer)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__MILLISECOND:
-				setMillisecond((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__HOUR:
-				setHour(HOUR_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__MINUTE:
-				setMinute(MINUTE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__SECOND:
-				setSecond(SECOND_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__MILLISECOND:
-				setMillisecond(MILLISECOND_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__HOUR:
-				return HOUR_EDEFAULT == null ? hour != null : !HOUR_EDEFAULT.equals(hour);
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__MINUTE:
-				return MINUTE_EDEFAULT == null ? minute != null : !MINUTE_EDEFAULT.equals(minute);
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__SECOND:
-				return SECOND_EDEFAULT == null ? second != null : !SECOND_EDEFAULT.equals(second);
-			case EclipseLinkOrmPackage.XML_TIME_OF_DAY__MILLISECOND:
-				return MILLISECOND_EDEFAULT == null ? millisecond != null : !MILLISECOND_EDEFAULT.equals(millisecond);
-		}
-		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(" (hour: ");
-		result.append(hour);
-		result.append(", minute: ");
-		result.append(minute);
-		result.append(", second: ");
-		result.append(second);
-		result.append(", millisecond: ");
-		result.append(millisecond);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildHourTranslator(),
-			buildMinuteTranslator(),
-			buildSecondTranslator(),
-			buildMillisecondTranslator(),
-		};
-	}
-	
-	protected static Translator buildHourTranslator() {
-		return new Translator(EclipseLink.EXPIRY_TIME_OF_DAY__HOUR, EclipseLinkOrmPackage.eINSTANCE.getXmlTimeOfDay_Hour(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildMinuteTranslator() {
-		return new Translator(EclipseLink.EXPIRY_TIME_OF_DAY__MINUTE, EclipseLinkOrmPackage.eINSTANCE.getXmlTimeOfDay_Minute(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildSecondTranslator() {
-		return new Translator(EclipseLink.EXPIRY_TIME_OF_DAY__SECOND, EclipseLinkOrmPackage.eINSTANCE.getXmlTimeOfDay_Second(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildMillisecondTranslator() {
-		return new Translator(EclipseLink.EXPIRY_TIME_OF_DAY__MILLISECOND, EclipseLinkOrmPackage.eINSTANCE.getXmlTimeOfDay_Millisecond(), Translator.DOM_ATTRIBUTE);
-	}
-	
-} // XmlTimeOfDay
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTransformation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTransformation.java
deleted file mode 100644
index 1dd37310cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTransformation.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-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.XmlTransformation_2_1;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Transformation Impl</b></em>'.
- *
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves. *
- *
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation()
- * @model kind="class"
- * @generated
- */
-public class XmlTransformation extends AbstractXmlAttributeMapping implements XmlTransformation_2_1, XmlAttributeMapping
-{
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTransformation()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TRANSFORMATION;
-	}
-	
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransformation_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransformation#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES:
-				return getProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES:
-				getProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlTransformation_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_TRANSFORMATION_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				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 == XmlTransformation_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_TRANSFORMATION_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_TRANSFORMATION__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_TRANSFORMATION__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_TRANSFORMATION__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				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(" (attributeType: ");
-		result.append(attributeType);
-		result.append(')');
-		return result.toString();
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-//			buildFetchTranslator(),
-//			buildOptionalTranslator(),
-			buildAccessTranslator(),
-//			buildMutableTranslator(),
-			buildAttributeTypeTranslator(),
-//			buildReadTransformerTranslator(),
-//			buildWriteTransformerTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator()
-		};
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlTransformation_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTransient.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTransient.java
deleted file mode 100644
index b1cc8eef0e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTransient.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.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;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Transient</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTransient()
- * @model kind="class"
- * @generated
- */
-public class XmlTransient extends org.eclipse.jpt.jpa.core.resource.orm.XmlTransient implements XmlAttributeMapping
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTransient()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TRANSIENT;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTransient#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_TRANSIENT__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_TRANSIENT__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_TRANSIENT__PROPERTIES:
-				return getProperties();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TRANSIENT__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_TRANSIENT__PROPERTIES:
-				getProperties().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_TRANSIENT__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_TRANSIENT__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_TRANSIENT__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_TRANSIENT__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			Translator.END_TAG_NO_INDENT,
-			EclipseLinkOrmPackage.eINSTANCE.getXmlTransient(), 
-			buildTranslatorChildren()
-			);
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator()
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTypeConverter.java
deleted file mode 100644
index 6ed61ef56f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTypeConverter.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.jdt.core.IType;
-import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Type CustomConverter</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.1
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter#getDataType <em>Data Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter#getObjectType <em>Object Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
- * @model kind="class"
- * @generated
- */
-public class XmlTypeConverter extends XmlNamedConverter
-{
-	/**
-	 * The default value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DATA_TYPE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dataType = DATA_TYPE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OBJECT_TYPE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String objectType = OBJECT_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTypeConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TYPE_CONVERTER;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Data Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Data 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>Data Type</em>' attribute.
-	 * @see #setDataType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_DataType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getDataType()
-	{
-		return dataType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter#getDataType <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data Type</em>' attribute.
-	 * @see #getDataType()
-	 * @generated
-	 */
-	public void setDataType(String newDataType)
-	{
-		String oldDataType = dataType;
-		dataType = newDataType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE, oldDataType, dataType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object 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>Object Type</em>' attribute.
-	 * @see #setObjectType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_ObjectType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getObjectType()
-	{
-		return objectType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlTypeConverter#getObjectType <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type</em>' attribute.
-	 * @see #getObjectType()
-	 * @generated
-	 */
-	public void setObjectType(String newObjectType)
-	{
-		String oldObjectType = objectType;
-		objectType = newObjectType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE, oldObjectType, objectType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE:
-				return getDataType();
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE:
-				return getObjectType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE:
-				setDataType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE:
-				setObjectType((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE:
-				setDataType(DATA_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE:
-				setObjectType(OBJECT_TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE:
-				return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType);
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE:
-				return OBJECT_TYPE_EDEFAULT == null ? objectType != null : !OBJECT_TYPE_EDEFAULT.equals(objectType);
-		}
-		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(" (dataType: ");
-		result.append(dataType);
-		result.append(", objectType: ");
-		result.append(objectType);
-		result.append(')');
-		return result.toString();
-	}
-	
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName,
-			structuralFeature,
-			Translator.END_TAG_NO_INDENT,
-			buildTranslatorChildren()
-		);
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildDataTypeTranslator(),
-			buildObjectTypeTranslator(),
-		};
-	}
-	
-	protected static Translator buildDataTypeTranslator() {
-		return new Translator(EclipseLink.TYPE_CONVERTER__DATA_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlTypeConverter_DataType(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildObjectTypeTranslator() {
-		return new Translator(EclipseLink.TYPE_CONVERTER__OBJECT_TYPE, EclipseLinkOrmPackage.eINSTANCE.getXmlTypeConverter_ObjectType(), Translator.DOM_ATTRIBUTE);
-	}
-
-
-	// ********** refactoring **********
-
-	public ReplaceEdit createRenameDataTypeEdit(IType originalType, String newName) {
-		String originalName = originalType.getTypeQualifiedName();
-		int nameIndex = this.dataType.lastIndexOf(originalName);
-		int offset = getAttributeNode(EclipseLink.TYPE_CONVERTER__DATA_TYPE).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
-	}
-
-	public ReplaceEdit createRenameDataTypePackageEdit(String newName) {
-		int packageLength = this.dataType.lastIndexOf('.');
-		if (packageLength == -1) {
-			packageLength = 0;
-			newName = newName + '.';
-		}
-		int offset = getAttributeNode(EclipseLink.TYPE_CONVERTER__DATA_TYPE).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset, packageLength, newName);
-	}
-
-	public ReplaceEdit createRenameObjectTypeEdit(IType originalType, String newName) {
-		String originalName = originalType.getTypeQualifiedName();
-		int nameIndex = this.objectType.lastIndexOf(originalName);
-		int offset = getAttributeNode(EclipseLink.TYPE_CONVERTER__OBJECT_TYPE).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
-	}
-
-	public ReplaceEdit createRenameObjectTypePackageEdit(String newName) {
-		int packageLength = this.objectType.lastIndexOf('.');
-		if (packageLength == -1) {
-			packageLength = 0;
-			newName = newName + '.';
-		}
-		int offset = getAttributeNode(EclipseLink.TYPE_CONVERTER__OBJECT_TYPE).getValueRegionStartOffset() + 1; // +1 = opening double quote
-		return new ReplaceEdit(offset, packageLength, newName);
-	}
-
-} // XmlTypeConverter
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
deleted file mode 100644
index 67b5c220b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlUnionPartitioning.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Union Partitioning</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlUnionPartitioning()
- * @model kind="class"
- * @generated
- */
-public class XmlUnionPartitioning extends AbstractJpaEObject implements XmlUnionPartitioning_2_2
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlUnionPartitioning()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_UNION_PARTITIONING;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlUnionPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlUnionPartitioning#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_UNION_PARTITIONING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_UNION_PARTITIONING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_UNION_PARTITIONING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_UNION_PARTITIONING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_UNION_PARTITIONING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlUnionPartitioning(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator()
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlUnionPartitioning_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlUnionPartitioning
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
deleted file mode 100644
index e1782a71b4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlValuePartitioning.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Value Partitioning</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlValuePartitioning()
- * @model kind="class"
- * @generated
- */
-public class XmlValuePartitioning extends AbstractJpaEObject implements XmlValuePartitioning_2_2
-{
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlValuePartitioning()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_VALUE_PARTITIONING;
-	}
-
-	/**
-	 * 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.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlValuePartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlValuePartitioning#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VALUE_PARTITIONING__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VALUE_PARTITIONING__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VALUE_PARTITIONING__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VALUE_PARTITIONING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VALUE_PARTITIONING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	// ********** translators **********
-
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlValuePartitioning(), 
-			buildTranslatorChildren());
-	}
-
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator()
-		};
-	}
-
-	protected static Translator buildNameTranslator() {
-		return new Translator(JPA.NAME, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlValuePartitioning_2_2_Name(), Translator.DOM_ATTRIBUTE);
-	}
-} // XmlValuePartitioning
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVariableOneToOne.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVariableOneToOne.java
deleted file mode 100644
index 5c23628bc9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVariableOneToOne.java
+++ /dev/null
@@ -1,1219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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;
-import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys;
-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.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2;
-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_2.XmlVariableOneToOne_2_2;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Variable One To One Impl</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.2
- * @since 2.2
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne()
- * @model kind="class"
- * @generated
- */
-public class XmlVariableOneToOne extends AbstractXmlAttributeMapping implements XmlAttributeMapping, XmlVariableOneToOne_2_2
-{
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The cached value of the '{@link #getPartitioning() <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPartitioning_2_2 partitioning;
-
-	/**
-	 * The cached value of the '{@link #getReplicationPartitioning() <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlReplicationPartitioning_2_2 replicationPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRoundRobinPartitioning() <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRoundRobinPartitioning_2_2 roundRobinPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getPinnedPartitioning() <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlPinnedPartitioning_2_2 pinnedPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getRangePartitioning() <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRangePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlRangePartitioning_2_2 rangePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getValuePartitioning() <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValuePartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlValuePartitioning_2_2 valuePartitioning;
-
-	/**
-	 * The cached value of the '{@link #getHashPartitioning() <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHashPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlHashPartitioning_2_2 hashPartitioning;
-
-	/**
-	 * The cached value of the '{@link #getUnionPartitioning() <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlUnionPartitioning_2_2 unionPartitioning;
-
-	/**
-	 * The default value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARTITIONED_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPartitioned() <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPartitioned()
-	 * @generated
-	 * @ordered
-	 */
-	protected String partitioned = PARTITIONED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNonCacheable() <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNonCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NON_CACHEABLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNonCacheable() <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNonCacheable()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean nonCacheable = NON_CACHEABLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlVariableOneToOne()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_VARIABLE_ONE_TO_ONE;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPartitioning_2_2 getPartitioning()
-	{
-		return partitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPartitioning(XmlPartitioning_2_2 newPartitioning, NotificationChain msgs)
-	{
-		XmlPartitioning_2_2 oldPartitioning = partitioning;
-		partitioning = newPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING, oldPartitioning, newPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	public void setPartitioning(XmlPartitioning_2_2 newPartitioning)
-	{
-		if (newPartitioning != partitioning)
-		{
-			NotificationChain msgs = null;
-			if (partitioning != null)
-				msgs = ((InternalEObject)partitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING, null, msgs);
-			if (newPartitioning != null)
-				msgs = ((InternalEObject)newPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING, null, msgs);
-			msgs = basicSetPartitioning(newPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING, newPartitioning, newPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlReplicationPartitioning_2_2 getReplicationPartitioning()
-	{
-		return replicationPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning, NotificationChain msgs)
-	{
-		XmlReplicationPartitioning_2_2 oldReplicationPartitioning = replicationPartitioning;
-		replicationPartitioning = newReplicationPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING, oldReplicationPartitioning, newReplicationPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	public void setReplicationPartitioning(XmlReplicationPartitioning_2_2 newReplicationPartitioning)
-	{
-		if (newReplicationPartitioning != replicationPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (replicationPartitioning != null)
-				msgs = ((InternalEObject)replicationPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING, null, msgs);
-			if (newReplicationPartitioning != null)
-				msgs = ((InternalEObject)newReplicationPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING, null, msgs);
-			msgs = basicSetReplicationPartitioning(newReplicationPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING, newReplicationPartitioning, newReplicationPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning()
-	{
-		return roundRobinPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning, NotificationChain msgs)
-	{
-		XmlRoundRobinPartitioning_2_2 oldRoundRobinPartitioning = roundRobinPartitioning;
-		roundRobinPartitioning = newRoundRobinPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING, oldRoundRobinPartitioning, newRoundRobinPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	public void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 newRoundRobinPartitioning)
-	{
-		if (newRoundRobinPartitioning != roundRobinPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (roundRobinPartitioning != null)
-				msgs = ((InternalEObject)roundRobinPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING, null, msgs);
-			if (newRoundRobinPartitioning != null)
-				msgs = ((InternalEObject)newRoundRobinPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING, null, msgs);
-			msgs = basicSetRoundRobinPartitioning(newRoundRobinPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING, newRoundRobinPartitioning, newRoundRobinPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlPinnedPartitioning_2_2 getPinnedPartitioning()
-	{
-		return pinnedPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning, NotificationChain msgs)
-	{
-		XmlPinnedPartitioning_2_2 oldPinnedPartitioning = pinnedPartitioning;
-		pinnedPartitioning = newPinnedPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING, oldPinnedPartitioning, newPinnedPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	public void setPinnedPartitioning(XmlPinnedPartitioning_2_2 newPinnedPartitioning)
-	{
-		if (newPinnedPartitioning != pinnedPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (pinnedPartitioning != null)
-				msgs = ((InternalEObject)pinnedPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING, null, msgs);
-			if (newPinnedPartitioning != null)
-				msgs = ((InternalEObject)newPinnedPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING, null, msgs);
-			msgs = basicSetPinnedPartitioning(newPinnedPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING, newPinnedPartitioning, newPinnedPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlRangePartitioning_2_2 getRangePartitioning()
-	{
-		return rangePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning, NotificationChain msgs)
-	{
-		XmlRangePartitioning_2_2 oldRangePartitioning = rangePartitioning;
-		rangePartitioning = newRangePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING, oldRangePartitioning, newRangePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	public void setRangePartitioning(XmlRangePartitioning_2_2 newRangePartitioning)
-	{
-		if (newRangePartitioning != rangePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (rangePartitioning != null)
-				msgs = ((InternalEObject)rangePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING, null, msgs);
-			if (newRangePartitioning != null)
-				msgs = ((InternalEObject)newRangePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING, null, msgs);
-			msgs = basicSetRangePartitioning(newRangePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING, newRangePartitioning, newRangePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlValuePartitioning_2_2 getValuePartitioning()
-	{
-		return valuePartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning, NotificationChain msgs)
-	{
-		XmlValuePartitioning_2_2 oldValuePartitioning = valuePartitioning;
-		valuePartitioning = newValuePartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING, oldValuePartitioning, newValuePartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	public void setValuePartitioning(XmlValuePartitioning_2_2 newValuePartitioning)
-	{
-		if (newValuePartitioning != valuePartitioning)
-		{
-			NotificationChain msgs = null;
-			if (valuePartitioning != null)
-				msgs = ((InternalEObject)valuePartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING, null, msgs);
-			if (newValuePartitioning != null)
-				msgs = ((InternalEObject)newValuePartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING, null, msgs);
-			msgs = basicSetValuePartitioning(newValuePartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING, newValuePartitioning, newValuePartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlHashPartitioning_2_2 getHashPartitioning()
-	{
-		return hashPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning, NotificationChain msgs)
-	{
-		XmlHashPartitioning_2_2 oldHashPartitioning = hashPartitioning;
-		hashPartitioning = newHashPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING, oldHashPartitioning, newHashPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	public void setHashPartitioning(XmlHashPartitioning_2_2 newHashPartitioning)
-	{
-		if (newHashPartitioning != hashPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (hashPartitioning != null)
-				msgs = ((InternalEObject)hashPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING, null, msgs);
-			if (newHashPartitioning != null)
-				msgs = ((InternalEObject)newHashPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING, null, msgs);
-			msgs = basicSetHashPartitioning(newHashPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING, newHashPartitioning, newHashPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlUnionPartitioning_2_2 getUnionPartitioning()
-	{
-		return unionPartitioning;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning, NotificationChain msgs)
-	{
-		XmlUnionPartitioning_2_2 oldUnionPartitioning = unionPartitioning;
-		unionPartitioning = newUnionPartitioning;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING, oldUnionPartitioning, newUnionPartitioning);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	public void setUnionPartitioning(XmlUnionPartitioning_2_2 newUnionPartitioning)
-	{
-		if (newUnionPartitioning != unionPartitioning)
-		{
-			NotificationChain msgs = null;
-			if (unionPartitioning != null)
-				msgs = ((InternalEObject)unionPartitioning).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING, null, msgs);
-			if (newUnionPartitioning != null)
-				msgs = ((InternalEObject)newUnionPartitioning).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING, null, msgs);
-			msgs = basicSetUnionPartitioning(newUnionPartitioning, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING, newUnionPartitioning, newUnionPartitioning));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getPartitioned()
-	{
-		return partitioned;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	public void setPartitioned(String newPartitioned)
-	{
-		String oldPartitioned = partitioned;
-		partitioned = newPartitioned;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED, oldPartitioned, partitioned));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #setNonCacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVariableOneToOne_2_2_NonCacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	public boolean isNonCacheable()
-	{
-		return nonCacheable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVariableOneToOne#isNonCacheable <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #isNonCacheable()
-	 * @generated
-	 */
-	public void setNonCacheable(boolean newNonCacheable)
-	{
-		boolean oldNonCacheable = nonCacheable;
-		nonCacheable = newNonCacheable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__NON_CACHEABLE, oldNonCacheable, nonCacheable));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING:
-				return basicSetPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				return basicSetReplicationPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return basicSetRoundRobinPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING:
-				return basicSetPinnedPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING:
-				return basicSetRangePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING:
-				return basicSetValuePartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING:
-				return basicSetHashPartitioning(null, msgs);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING:
-				return basicSetUnionPartitioning(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 EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING:
-				return getPartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				return getReplicationPartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return getRoundRobinPartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING:
-				return getPinnedPartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING:
-				return getRangePartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING:
-				return getValuePartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING:
-				return getHashPartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING:
-				return getUnionPartitioning();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED:
-				return getPartitioned();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__NON_CACHEABLE:
-				return isNonCacheable();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED:
-				setPartitioned((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__NON_CACHEABLE:
-				setNonCacheable((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING:
-				setPartitioning((XmlPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				setReplicationPartitioning((XmlReplicationPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				setRoundRobinPartitioning((XmlRoundRobinPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING:
-				setPinnedPartitioning((XmlPinnedPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING:
-				setRangePartitioning((XmlRangePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING:
-				setValuePartitioning((XmlValuePartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING:
-				setHashPartitioning((XmlHashPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING:
-				setUnionPartitioning((XmlUnionPartitioning_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED:
-				setPartitioned(PARTITIONED_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__NON_CACHEABLE:
-				setNonCacheable(NON_CACHEABLE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING:
-				return partitioning != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING:
-				return replicationPartitioning != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING:
-				return roundRobinPartitioning != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING:
-				return pinnedPartitioning != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING:
-				return rangePartitioning != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING:
-				return valuePartitioning != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING:
-				return hashPartitioning != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING:
-				return unionPartitioning != null;
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED:
-				return PARTITIONED_EDEFAULT == null ? partitioned != null : !PARTITIONED_EDEFAULT.equals(partitioned);
-			case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__NON_CACHEABLE:
-				return nonCacheable != NON_CACHEABLE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING;
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED: return EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVariableOneToOne_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__NON_CACHEABLE: return EclipseLinkOrmV2_2Package.XML_VARIABLE_ONE_TO_ONE_22__NON_CACHEABLE;
-				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 == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPartitioningGroup_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONING: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__REPLICATION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__ROUND_ROBIN_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PINNED_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__RANGE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__VALUE_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__HASH_PARTITIONING: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__HASH_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__UNION_PARTITIONING: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__UNION_PARTITIONING;
-				case EclipseLinkOrmV2_2Package.XML_PARTITIONING_GROUP_22__PARTITIONED: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__PARTITIONED;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVariableOneToOne_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_VARIABLE_ONE_TO_ONE_22__NON_CACHEABLE: return EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE__NON_CACHEABLE;
-				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(" (partitioned: ");
-		result.append(partitioned);
-		result.append(", nonCacheable: ");
-		result.append(nonCacheable);
-		result.append(')');
-		return result.toString();
-	}
-
-	public String getMappingKey() {
-		return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(elementName, structuralFeature, buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator(),
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java
deleted file mode 100644
index 0770375ca9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlVersion.java
+++ /dev/null
@@ -1,1135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jpt.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.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.XmlVersion_2_1;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2;
-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;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * A representation of the model object '<em><b>Xml Version</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.1
- * 
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion()
- * @model kind="class"
- * @generated
- */
-public class XmlVersion extends org.eclipse.jpt.jpa.core.resource.orm.XmlVersion implements XmlVersion_2_1, XmlVersion_2_2, XmlAttributeMapping, XmlMutable, XmlConvertibleMapping
-{
-	/**
-	 * The default value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttributeType() <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attributeType = ATTRIBUTE_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getIndex() <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlIndex_2_2 index;
-
-	/**
-	 * The cached value of the '{@link #getAccessMethods() <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlAccessMethods accessMethods;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<XmlProperty> properties;
-
-	/**
-	 * The default value of the '{@link #getMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMutable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Boolean MUTABLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMutable() <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMutable()
-	 * @generated
-	 * @ordered
-	 */
-	protected Boolean mutable = MUTABLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlConverter converter;
-
-	/**
-	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlTypeConverter typeConverter;
-
-	/**
-	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlObjectTypeConverter objectTypeConverter;
-
-	/**
-	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStructConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected XmlStructConverter structConverter;
-
-	/**
-	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONVERT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String convert = CONVERT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlVersion()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_VERSION;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getAttributeType()
-	{
-		return attributeType;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	public void setAttributeType(String newAttributeType)
-	{
-		String oldAttributeType = attributeType;
-		attributeType = newAttributeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE, oldAttributeType, attributeType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(XmlIndex_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion_2_2_Index()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlIndex_2_2 getIndex()
-	{
-		return index;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIndex(XmlIndex_2_2 newIndex, NotificationChain msgs)
-	{
-		XmlIndex_2_2 oldIndex = index;
-		index = newIndex;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__INDEX, oldIndex, newIndex);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	public void setIndex(XmlIndex_2_2 newIndex)
-	{
-		if (newIndex != index)
-		{
-			NotificationChain msgs = null;
-			if (index != null)
-				msgs = ((InternalEObject)index).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__INDEX, null, msgs);
-			if (newIndex != null)
-				msgs = ((InternalEObject)newIndex).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__INDEX, null, msgs);
-			msgs = basicSetIndex(newIndex, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__INDEX, newIndex, newIndex));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Mutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mutable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Mutable</em>' attribute.
-	 * @see #setMutable(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlMutable_Mutable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	public Boolean getMutable()
-	{
-		return mutable;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getMutable <em>Mutable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Mutable</em>' attribute.
-	 * @see #getMutable()
-	 * @generated
-	 */
-	public void setMutable(Boolean newMutable)
-	{
-		Boolean oldMutable = mutable;
-		mutable = newMutable;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__MUTABLE, oldMutable, mutable));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Convert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Convert</em>' attribute.
-	 * @see #setConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping_Convert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	public String getConvert()
-	{
-		return convert;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getConvert <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Convert</em>' attribute.
-	 * @see #getConvert()
-	 * @generated
-	 */
-	public void setConvert(String newConvert)
-	{
-		String oldConvert = convert;
-		convert = newConvert;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__CONVERT, oldConvert, convert));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Access Methods</em>' containment reference.
-	 * @see #setAccessMethods(XmlAccessMethods)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlAccessMethodsHolder_AccessMethods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlAccessMethods getAccessMethods()
-	{
-		return accessMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAccessMethods(XmlAccessMethods newAccessMethods, NotificationChain msgs)
-	{
-		XmlAccessMethods oldAccessMethods = accessMethods;
-		accessMethods = newAccessMethods;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS, oldAccessMethods, newAccessMethods);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getAccessMethods <em>Access Methods</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Access Methods</em>' containment reference.
-	 * @see #getAccessMethods()
-	 * @generated
-	 */
-	public void setAccessMethods(XmlAccessMethods newAccessMethods)
-	{
-		if (newAccessMethods != accessMethods)
-		{
-			NotificationChain msgs = null;
-			if (accessMethods != null)
-				msgs = ((InternalEObject)accessMethods).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS, null, msgs);
-			if (newAccessMethods != null)
-				msgs = ((InternalEObject)newAccessMethods).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS, null, msgs);
-			msgs = basicSetAccessMethods(newAccessMethods, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS, newAccessMethods, newAccessMethods));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>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>Properties</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPropertyContainer_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlProperty> getProperties()
-	{
-		if (properties == null)
-		{
-			properties = new EObjectContainmentEList<XmlProperty>(XmlProperty.class, this, EclipseLinkOrmPackage.XML_VERSION__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>CustomConverter</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>Converter</em>' containment reference.
-	 * @see #setConverter(XmlConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_Converter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlConverter getConverter()
-	{
-		return converter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetConverter(XmlConverter newConverter, NotificationChain msgs)
-	{
-		XmlConverter oldConverter = converter;
-		converter = newConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__CONVERTER, oldConverter, newConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getConverter <em>Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Converter</em>' containment reference.
-	 * @see #getConverter()
-	 * @generated
-	 */
-	public void setConverter(XmlConverter newConverter)
-	{
-		if (newConverter != converter)
-		{
-			NotificationChain msgs = null;
-			if (converter != null)
-				msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__CONVERTER, null, msgs);
-			if (newConverter != null)
-				msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__CONVERTER, null, msgs);
-			msgs = basicSetConverter(newConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__CONVERTER, newConverter, newConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type CustomConverter</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>Type Converter</em>' containment reference.
-	 * @see #setTypeConverter(XmlTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_TypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlTypeConverter getTypeConverter()
-	{
-		return typeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTypeConverter(XmlTypeConverter newTypeConverter, NotificationChain msgs)
-	{
-		XmlTypeConverter oldTypeConverter = typeConverter;
-		typeConverter = newTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER, oldTypeConverter, newTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getTypeConverter <em>Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type Converter</em>' containment reference.
-	 * @see #getTypeConverter()
-	 * @generated
-	 */
-	public void setTypeConverter(XmlTypeConverter newTypeConverter)
-	{
-		if (newTypeConverter != typeConverter)
-		{
-			NotificationChain msgs = null;
-			if (typeConverter != null)
-				msgs = ((InternalEObject)typeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER, null, msgs);
-			if (newTypeConverter != null)
-				msgs = ((InternalEObject)newTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER, null, msgs);
-			msgs = basicSetTypeConverter(newTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER, newTypeConverter, newTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object Type CustomConverter</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>Object Type Converter</em>' containment reference.
-	 * @see #setObjectTypeConverter(XmlObjectTypeConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_ObjectTypeConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlObjectTypeConverter getObjectTypeConverter()
-	{
-		return objectTypeConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter, NotificationChain msgs)
-	{
-		XmlObjectTypeConverter oldObjectTypeConverter = objectTypeConverter;
-		objectTypeConverter = newObjectTypeConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER, oldObjectTypeConverter, newObjectTypeConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getObjectTypeConverter <em>Object Type Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object Type Converter</em>' containment reference.
-	 * @see #getObjectTypeConverter()
-	 * @generated
-	 */
-	public void setObjectTypeConverter(XmlObjectTypeConverter newObjectTypeConverter)
-	{
-		if (newObjectTypeConverter != objectTypeConverter)
-		{
-			NotificationChain msgs = null;
-			if (objectTypeConverter != null)
-				msgs = ((InternalEObject)objectTypeConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER, null, msgs);
-			if (newObjectTypeConverter != null)
-				msgs = ((InternalEObject)newObjectTypeConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER, null, msgs);
-			msgs = basicSetObjectTypeConverter(newObjectTypeConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER, newObjectTypeConverter, newObjectTypeConverter));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct CustomConverter</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>Struct Converter</em>' containment reference.
-	 * @see #setStructConverter(XmlStructConverter)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder_StructConverter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public XmlStructConverter getStructConverter()
-	{
-		return structConverter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetStructConverter(XmlStructConverter newStructConverter, NotificationChain msgs)
-	{
-		XmlStructConverter oldStructConverter = structConverter;
-		structConverter = newStructConverter;
-		if (eNotificationRequired())
-		{
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER, oldStructConverter, newStructConverter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion#getStructConverter <em>Struct Converter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct Converter</em>' containment reference.
-	 * @see #getStructConverter()
-	 * @generated
-	 */
-	public void setStructConverter(XmlStructConverter newStructConverter)
-	{
-		if (newStructConverter != structConverter)
-		{
-			NotificationChain msgs = null;
-			if (structConverter != null)
-				msgs = ((InternalEObject)structConverter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER, null, msgs);
-			if (newStructConverter != null)
-				msgs = ((InternalEObject)newStructConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER, null, msgs);
-			msgs = basicSetStructConverter(newStructConverter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER, newStructConverter, newStructConverter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VERSION__INDEX:
-				return basicSetIndex(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS:
-				return basicSetAccessMethods(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERTER:
-				return basicSetConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER:
-				return basicSetTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER:
-				return basicSetObjectTypeConverter(null, msgs);
-			case EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER:
-				return basicSetStructConverter(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 EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE:
-				return getAttributeType();
-			case EclipseLinkOrmPackage.XML_VERSION__INDEX:
-				return getIndex();
-			case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS:
-				return getAccessMethods();
-			case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES:
-				return getProperties();
-			case EclipseLinkOrmPackage.XML_VERSION__MUTABLE:
-				return getMutable();
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERTER:
-				return getConverter();
-			case EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER:
-				return getTypeConverter();
-			case EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER:
-				return getObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER:
-				return getStructConverter();
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERT:
-				return getConvert();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE:
-				setAttributeType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__INDEX:
-				setIndex((XmlIndex_2_2)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends XmlProperty>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__MUTABLE:
-				setMutable((Boolean)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERTER:
-				setConverter((XmlConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERT:
-				setConvert((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE:
-				setAttributeType(ATTRIBUTE_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__INDEX:
-				setIndex((XmlIndex_2_2)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS:
-				setAccessMethods((XmlAccessMethods)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES:
-				getProperties().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__MUTABLE:
-				setMutable(MUTABLE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERTER:
-				setConverter((XmlConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER:
-				setTypeConverter((XmlTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER:
-				setObjectTypeConverter((XmlObjectTypeConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER:
-				setStructConverter((XmlStructConverter)null);
-				return;
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE:
-				return ATTRIBUTE_TYPE_EDEFAULT == null ? attributeType != null : !ATTRIBUTE_TYPE_EDEFAULT.equals(attributeType);
-			case EclipseLinkOrmPackage.XML_VERSION__INDEX:
-				return index != null;
-			case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS:
-				return accessMethods != null;
-			case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case EclipseLinkOrmPackage.XML_VERSION__MUTABLE:
-				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERTER:
-				return converter != null;
-			case EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER:
-				return typeConverter != null;
-			case EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER:
-				return objectTypeConverter != null;
-			case EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER:
-				return structConverter != null;
-			case EclipseLinkOrmPackage.XML_VERSION__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-	{
-		if (baseClass == XmlVersion_2_1.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE: return EclipseLinkOrmV2_1Package.XML_VERSION_21__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVersion_2_2.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION__INDEX: return EclipseLinkOrmV2_2Package.XML_VERSION_22__INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION__PROPERTIES: return EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMutable.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION__MUTABLE: return EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (derivedFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_VERSION__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
-				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 == XmlVersion_2_1.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_1Package.XML_VERSION_21__ATTRIBUTE_TYPE: return EclipseLinkOrmPackage.XML_VERSION__ATTRIBUTE_TYPE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlVersion_2_2.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmV2_2Package.XML_VERSION_22__INDEX: return EclipseLinkOrmPackage.XML_VERSION__INDEX;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAccessMethodsHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS: return EclipseLinkOrmPackage.XML_VERSION__ACCESS_METHODS;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlPropertyContainer.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_PROPERTY_CONTAINER__PROPERTIES: return EclipseLinkOrmPackage.XML_VERSION__PROPERTIES;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlAttributeMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlMutable.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_MUTABLE__MUTABLE: return EclipseLinkOrmPackage.XML_VERSION__MUTABLE;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConverterHolder.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_VERSION__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION__STRUCT_CONVERTER;
-				default: return -1;
-			}
-		}
-		if (baseClass == XmlConvertibleMapping.class)
-		{
-			switch (baseFeatureID)
-			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_VERSION__CONVERT;
-				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(" (attributeType: ");
-		result.append(attributeType);
-		result.append(", mutable: ");
-		result.append(mutable);
-		result.append(", convert: ");
-		result.append(convert);
-		result.append(')');
-		return result.toString();
-	}
-	
-	public TextRange getMutableTextRange() {
-		return getAttributeTextRange(EclipseLink.MUTABLE);
-	}
-	
-	public TextRange getConvertTextRange() {
-		return getElementTextRange(EclipseLink.CONVERT);
-	}
-	
-	
-	// ********** translators **********
-	
-	public static Translator buildTranslator(String elementName, EStructuralFeature structuralFeature) {
-		return new SimpleTranslator(
-			elementName, 
-			structuralFeature, 
-			EclipseLinkOrmPackage.eINSTANCE.getXmlVersion(), 
-			buildTranslatorChildren());
-	}
-	
-	private static Translator[] buildTranslatorChildren() {
-		return new Translator[] {
-			buildNameTranslator(),
-			buildAccessTranslator(),
-			buildMutableTranslator(),
-			buildAttributeTypeTranslator(),
-			buildColumnTranslator(), 
-			buildIndexTranslator(), 
-			buildTemporalTranslator(),
-			buildConvertTranslator(),
-			buildConverterTranslator(),
-			buildTypeConverterTranslator(),
-			buildObjectTypeConverterTranslator(),
-			buildStructConverterTranslator(),
-			buildPropertyTranslator(),
-			buildAccessMethodsTranslator()
-		};
-	}
-	
-	protected static Translator buildMutableTranslator() {
-		return new Translator(EclipseLink.MUTABLE, EclipseLinkOrmPackage.eINSTANCE.getXmlMutable_Mutable(), Translator.DOM_ATTRIBUTE);
-	}
-	
-	protected static Translator buildIndexTranslator() {
-		return XmlIndex.buildTranslator(EclipseLink2_2.INDEX, EclipseLinkOrmV2_2Package.eINSTANCE.getXmlVersion_2_2_Index());
-	}
-	
-	protected static Translator buildConvertTranslator() {
-		return new Translator(EclipseLink.CONVERT, EclipseLinkOrmPackage.eINSTANCE.getXmlConvertibleMapping_Convert());
-	}
-	
-	protected static Translator buildConverterTranslator() {
-		return XmlConverter.buildTranslator(EclipseLink.CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_Converter());
-	}
-	
-	protected static Translator buildTypeConverterTranslator() {
-		return XmlTypeConverter.buildTranslator(EclipseLink.TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_TypeConverter());
-	}
-	
-	protected static Translator buildObjectTypeConverterTranslator() {
-		return XmlObjectTypeConverter.buildTranslator(EclipseLink.OBJECT_TYPE_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_ObjectTypeConverter());
-	}
-	
-	protected static Translator buildStructConverterTranslator() {
-		return XmlStructConverter.buildTranslator(EclipseLink.STRUCT_CONVERTER, EclipseLinkOrmPackage.eINSTANCE.getXmlConverterHolder_StructConverter());
-	}
-	
-	protected static Translator buildPropertyTranslator() {
-		return XmlProperty.buildTranslator(EclipseLink.PROPERTY, EclipseLinkOrmPackage.eINSTANCE.getXmlPropertyContainer_Properties());
-	}
-	
-	protected static Translator buildAccessMethodsTranslator() {
-		return XmlAccessMethods.buildTranslator(EclipseLink.ACCESS_METHODS, EclipseLinkOrmPackage.eINSTANCE.getXmlAccessMethodsHolder_AccessMethods());
-	}
-
-	protected static Translator buildAttributeTypeTranslator() {
-		return new Translator(EclipseLink2_1.ATTRIBUTE_TYPE, EclipseLinkOrmV2_1Package.eINSTANCE.getXmlVersion_2_1_AttributeType(), Translator.DOM_ATTRIBUTE);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLink1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLink1_1.java
deleted file mode 100644
index 67a19897f0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLink1_1.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-
-@SuppressWarnings("nls")
-public interface EclipseLink1_1
-	extends EclipseLink
-{
-	String SCHEMA_NAMESPACE = EclipseLink.SCHEMA_NAMESPACE;
-	String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_1.xsd";
-	String SCHEMA_VERSION	= "1.1";
-	
-	// EclipseLink 1.1 specific nodes
-	
-	String PRIMARY_KEY = "primary-key";  //$NON-NLS-1$
-	String PRIMARY_KEY__VALIDATION = "validation";  //$NON-NLS-1$
-	String PRIMARY_KEY__COLUMN = "column";  //$NON-NLS-1$
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Factory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Factory.java
deleted file mode 100644
index e96e4dc88e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Factory.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package
- * @generated
- */
-public class EclipseLinkOrmV1_1Factory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV1_1Factory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EclipseLinkOrmV1_1Factory init()
-	{
-		try
-		{
-			EclipseLinkOrmV1_1Factory theEclipseLinkOrmV1_1Factory = (EclipseLinkOrmV1_1Factory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.v1_1.xmi"); 
-			if (theEclipseLinkOrmV1_1Factory != null)
-			{
-				return theEclipseLinkOrmV1_1Factory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EclipseLinkOrmV1_1Factory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV1_1Factory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
-			case EclipseLinkOrmV1_1Package.ID_VALIDATION_TYPE_11:
-				return createIdValidationType_1_1FromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
-			case EclipseLinkOrmV1_1Package.ID_VALIDATION_TYPE_11:
-				return convertIdValidationType_1_1ToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IdValidationType_1_1 createIdValidationType_1_1FromString(EDataType eDataType, String initialValue)
-	{
-		IdValidationType_1_1 result = IdValidationType_1_1.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertIdValidationType_1_1ToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV1_1Package getEclipseLinkOrmV1_1Package()
-	{
-		return (EclipseLinkOrmV1_1Package)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EclipseLinkOrmV1_1Package getPackage()
-	{
-		return EclipseLinkOrmV1_1Package.eINSTANCE;
-	}
-
-} //EclipseLinkOrmV1_1Factory
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
deleted file mode 100644
index 42e5d8554d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/EclipseLinkOrmV1_1Package.java
+++ /dev/null
@@ -1,696 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.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;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
-
-/**
- * <!-- 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.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Factory
- * @model kind="package"
- * @generated
- */
-public class EclipseLinkOrmV1_1Package extends EPackageImpl
-{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNAME = "v1_1";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_URI = "jpt.eclipselink.orm.v1_1.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV1_1Package eINSTANCE = org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1 <em>Xml Basic 11</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlBasic_1_1()
-	 * @generated
-	 */
-	public static final int XML_BASIC_11 = 0;
-
-	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_11__SEQUENCE_GENERATOR = OrmPackage.XML_GENERATOR_CONTAINER__SEQUENCE_GENERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_11__TABLE_GENERATOR = OrmPackage.XML_GENERATOR_CONTAINER__TABLE_GENERATOR;
-
-	/**
-	 * The feature id for the '<em><b>Generated Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_11__GENERATED_VALUE = OrmPackage.XML_GENERATOR_CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic 11</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_11_FEATURE_COUNT = OrmPackage.XML_GENERATOR_CONTAINER_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1 <em>Xml Entity 11</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlEntity_1_1()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_11 = 1;
-
-	/**
-	 * The feature id for the '<em><b>Primary Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_11__PRIMARY_KEY = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity 11</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_11_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1 <em>Xml Mapped Superclass 11</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlMappedSuperclass_1_1()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_11 = 2;
-
-	/**
-	 * The feature id for the '<em><b>Primary Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Mapped Superclass 11</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_11_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1 <em>Xml Primary Key 11</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlPrimaryKey_1_1()
-	 * @generated
-	 */
-	public static final int XML_PRIMARY_KEY_11 = 3;
-
-	/**
-	 * The feature id for the '<em><b>Validation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_11__VALIDATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_11__COLUMNS = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Primary Key 11</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_11_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1 <em>Id Validation Type 11</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getIdValidationType_1_1()
-	 * @generated
-	 */
-	public static final int ID_VALIDATION_TYPE_11 = 4;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasic_1_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntity_1_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclass_1_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPrimaryKey_1_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum idValidationType_1_1EEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EclipseLinkOrmV1_1Package()
-	{
-		super(eNS_URI, EclipseLinkOrmV1_1Factory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link EclipseLinkOrmV1_1Package#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EclipseLinkOrmV1_1Package init()
-	{
-		if (isInited) return (EclipseLinkOrmV1_1Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI);
-
-		// Obtain or create and register package
-		EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV1_1Package());
-
-		isInited = true;
-
-		// 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);
-		EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
-		EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
-		EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) : EclipseLinkOrmV2_2Package.eINSTANCE);
-		EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) : EclipseLinkOrmV2_3Package.eINSTANCE);
-		EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) : EclipseLinkOrmV2_4Package.eINSTANCE);
-
-		// Create package meta-data objects
-		theEclipseLinkOrmV1_1Package.createPackageContents();
-		theEclipseLinkOrmPackage.createPackageContents();
-		theEclipseLinkOrmV2_0Package.createPackageContents();
-		theEclipseLinkOrmV2_1Package.createPackageContents();
-		theEclipseLinkOrmV2_2Package.createPackageContents();
-		theEclipseLinkOrmV2_3Package.createPackageContents();
-		theEclipseLinkOrmV2_4Package.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLinkOrmV1_1Package.initializePackageContents();
-		theEclipseLinkOrmPackage.initializePackageContents();
-		theEclipseLinkOrmV2_0Package.initializePackageContents();
-		theEclipseLinkOrmV2_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_2Package.initializePackageContents();
-		theEclipseLinkOrmV2_3Package.initializePackageContents();
-		theEclipseLinkOrmV2_4Package.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLinkOrmV1_1Package.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(EclipseLinkOrmV1_1Package.eNS_URI, theEclipseLinkOrmV1_1Package);
-		return theEclipseLinkOrmV1_1Package;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1 <em>Xml Basic 11</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic 11</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1
-	 * @generated
-	 */
-	public EClass getXmlBasic_1_1()
-	{
-		return xmlBasic_1_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1#getGeneratedValue <em>Generated Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Generated Value</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1#getGeneratedValue()
-	 * @see #getXmlBasic_1_1()
-	 * @generated
-	 */
-	public EReference getXmlBasic_1_1_GeneratedValue()
-	{
-		return (EReference)xmlBasic_1_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1 <em>Xml Entity 11</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity 11</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1
-	 * @generated
-	 */
-	public EClass getXmlEntity_1_1()
-	{
-		return xmlEntity_1_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1#getPrimaryKey <em>Primary Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Primary Key</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1#getPrimaryKey()
-	 * @see #getXmlEntity_1_1()
-	 * @generated
-	 */
-	public EReference getXmlEntity_1_1_PrimaryKey()
-	{
-		return (EReference)xmlEntity_1_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1 <em>Xml Mapped Superclass 11</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mapped Superclass 11</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass_1_1()
-	{
-		return xmlMappedSuperclass_1_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1#getPrimaryKey <em>Primary Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Primary Key</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1#getPrimaryKey()
-	 * @see #getXmlMappedSuperclass_1_1()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_1_1_PrimaryKey()
-	{
-		return (EReference)xmlMappedSuperclass_1_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1 <em>Xml Primary Key 11</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Primary Key 11</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1
-	 * @generated
-	 */
-	public EClass getXmlPrimaryKey_1_1()
-	{
-		return xmlPrimaryKey_1_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1#getValidation <em>Validation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Validation</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1#getValidation()
-	 * @see #getXmlPrimaryKey_1_1()
-	 * @generated
-	 */
-	public EAttribute getXmlPrimaryKey_1_1_Validation()
-	{
-		return (EAttribute)xmlPrimaryKey_1_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1#getColumns <em>Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Columns</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1#getColumns()
-	 * @see #getXmlPrimaryKey_1_1()
-	 * @generated
-	 */
-	public EReference getXmlPrimaryKey_1_1_Columns()
-	{
-		return (EReference)xmlPrimaryKey_1_1EClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1 <em>Id Validation Type 11</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Id Validation Type 11</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1
-	 * @generated
-	 */
-	public EEnum getIdValidationType_1_1()
-	{
-		return idValidationType_1_1EEnum;
-	}
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	public EclipseLinkOrmV1_1Factory getEclipseLinkOrmV1_1Factory()
-	{
-		return (EclipseLinkOrmV1_1Factory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents()
-	{
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		xmlBasic_1_1EClass = createEClass(XML_BASIC_11);
-		createEReference(xmlBasic_1_1EClass, XML_BASIC_11__GENERATED_VALUE);
-
-		xmlEntity_1_1EClass = createEClass(XML_ENTITY_11);
-		createEReference(xmlEntity_1_1EClass, XML_ENTITY_11__PRIMARY_KEY);
-
-		xmlMappedSuperclass_1_1EClass = createEClass(XML_MAPPED_SUPERCLASS_11);
-		createEReference(xmlMappedSuperclass_1_1EClass, XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY);
-
-		xmlPrimaryKey_1_1EClass = createEClass(XML_PRIMARY_KEY_11);
-		createEAttribute(xmlPrimaryKey_1_1EClass, XML_PRIMARY_KEY_11__VALIDATION);
-		createEReference(xmlPrimaryKey_1_1EClass, XML_PRIMARY_KEY_11__COLUMNS);
-
-		// Create enums
-		idValidationType_1_1EEnum = createEEnum(ID_VALIDATION_TYPE_11);
-	}
-
-	/**
-	 * <!-- 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
-		OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		xmlBasic_1_1EClass.getESuperTypes().add(theOrmPackage.getXmlGeneratorContainer());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlBasic_1_1EClass, XmlBasic_1_1.class, "XmlBasic_1_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBasic_1_1_GeneratedValue(), theOrmPackage.getXmlGeneratedValue(), null, "generatedValue", null, 0, 1, XmlBasic_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntity_1_1EClass, XmlEntity_1_1.class, "XmlEntity_1_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntity_1_1_PrimaryKey(), theEclipseLinkOrmPackage.getXmlPrimaryKey(), null, "primaryKey", null, 0, 1, XmlEntity_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMappedSuperclass_1_1EClass, XmlMappedSuperclass_1_1.class, "XmlMappedSuperclass_1_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMappedSuperclass_1_1_PrimaryKey(), theEclipseLinkOrmPackage.getXmlPrimaryKey(), null, "primaryKey", null, 0, 1, XmlMappedSuperclass_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPrimaryKey_1_1EClass, XmlPrimaryKey_1_1.class, "XmlPrimaryKey_1_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPrimaryKey_1_1_Validation(), this.getIdValidationType_1_1(), "validation", null, 0, 1, XmlPrimaryKey_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPrimaryKey_1_1_Columns(), theOrmPackage.getXmlColumn(), null, "columns", null, 0, -1, XmlPrimaryKey_1_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(idValidationType_1_1EEnum, IdValidationType_1_1.class, "IdValidationType_1_1");
-		addEEnumLiteral(idValidationType_1_1EEnum, IdValidationType_1_1.NULL);
-		addEEnumLiteral(idValidationType_1_1EEnum, IdValidationType_1_1.ZERO);
-		addEEnumLiteral(idValidationType_1_1EEnum, IdValidationType_1_1.NONE);
-	}
-
-	/**
-	 * <!-- 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.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1 <em>Xml Basic 11</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlBasic_1_1()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_11 = eINSTANCE.getXmlBasic_1_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Generated Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_BASIC_11__GENERATED_VALUE = eINSTANCE.getXmlBasic_1_1_GeneratedValue();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1 <em>Xml Entity 11</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlEntity_1_1()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_11 = eINSTANCE.getXmlEntity_1_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Primary Key</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_11__PRIMARY_KEY = eINSTANCE.getXmlEntity_1_1_PrimaryKey();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1 <em>Xml Mapped Superclass 11</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlMappedSuperclass_1_1()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPED_SUPERCLASS_11 = eINSTANCE.getXmlMappedSuperclass_1_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Primary Key</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_11__PRIMARY_KEY = eINSTANCE.getXmlMappedSuperclass_1_1_PrimaryKey();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1 <em>Xml Primary Key 11</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlPrimaryKey_1_1()
-		 * @generated
-		 */
-		public static final EClass XML_PRIMARY_KEY_11 = eINSTANCE.getXmlPrimaryKey_1_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Validation</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PRIMARY_KEY_11__VALIDATION = eINSTANCE.getXmlPrimaryKey_1_1_Validation();
-
-		/**
-		 * The meta object literal for the '<em><b>Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PRIMARY_KEY_11__COLUMNS = eINSTANCE.getXmlPrimaryKey_1_1_Columns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1 <em>Id Validation Type 11</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getIdValidationType_1_1()
-		 * @generated
-		 */
-		public static final EEnum ID_VALIDATION_TYPE_11 = eINSTANCE.getIdValidationType_1_1();
-
-	}
-
-} //EclipseLinkOrmV1_1Package
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/IdValidationType_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/IdValidationType_1_1.java
deleted file mode 100644
index 86526aa17f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/IdValidationType_1_1.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Id Validation Type 11</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getIdValidationType_1_1()
- * @model
- * @generated
- */
-public enum IdValidationType_1_1 implements Enumerator
-{
-	/**
-	 * The '<em><b>NULL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NULL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NULL(0, "NULL", "NULL"),
-
-	/**
-	 * The '<em><b>ZERO</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ZERO_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ZERO(2, "ZERO", "ZERO"),
-
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NONE(2, "NONE", "NONE");
-
-	/**
-	 * The '<em><b>NULL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NULL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NULL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NULL_VALUE = 0;
-
-	/**
-	 * The '<em><b>ZERO</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ZERO</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ZERO
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ZERO_VALUE = 2;
-
-	/**
-	 * 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 = 2;
-
-	/**
-	 * An array of all the '<em><b>Id Validation Type 11</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final IdValidationType_1_1[] VALUES_ARRAY =
-		new IdValidationType_1_1[]
-		{
-			NULL,
-			ZERO,
-			NONE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Id Validation Type 11</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<IdValidationType_1_1> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Id Validation Type 11</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static IdValidationType_1_1 get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			IdValidationType_1_1 result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Id Validation Type 11</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static IdValidationType_1_1 getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			IdValidationType_1_1 result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Id Validation Type 11</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static IdValidationType_1_1 get(int value)
-	{
-		switch (value)
-		{
-			case NULL_VALUE: return NULL;
-			case ZERO_VALUE: return ZERO;
-		}
-		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 IdValidationType_1_1(int value, String name, String literal)
-	{
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue()
-	{
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName()
-	{
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral()
-	{
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		return literal;
-	}
-	
-} //IdValidationType_1_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlBasic_1_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlBasic_1_1.java
deleted file mode 100644
index 62f5765c4a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlBasic_1_1.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
-
-import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratedValue;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic 11</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1#getGeneratedValue <em>Generated Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlBasic_1_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlBasic_1_1 extends XmlGeneratorContainer
-{
-	/**
-	 * Returns the value of the '<em><b>Generated Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Generated Value</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>Generated Value</em>' containment reference.
-	 * @see #setGeneratedValue(XmlGeneratedValue)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlBasic_1_1_GeneratedValue()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlGeneratedValue getGeneratedValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlBasic_1_1#getGeneratedValue <em>Generated Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Generated Value</em>' containment reference.
-	 * @see #getGeneratedValue()
-	 * @generated
-	 */
-	void setGeneratedValue(XmlGeneratedValue value);
-
-} // XmlBasic_1_1
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
deleted file mode 100644
index 69bdd82004..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlEntity_1_1.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009, 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity 11</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1#getPrimaryKey <em>Primary Key</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlEntity_1_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Primary Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key</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>Primary Key</em>' containment reference.
-	 * @see #setPrimaryKey(XmlPrimaryKey)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlEntity_1_1_PrimaryKey()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlPrimaryKey getPrimaryKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlEntity_1_1#getPrimaryKey <em>Primary Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key</em>' containment reference.
-	 * @see #getPrimaryKey()
-	 * @generated
-	 */
-	void setPrimaryKey(XmlPrimaryKey value);
-
-} // XmlEntity_1_1
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
deleted file mode 100644
index 7451f79963..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlMappedSuperclass_1_1.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPrimaryKey;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Mapped Superclass 11</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1#getPrimaryKey <em>Primary Key</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlMappedSuperclass_1_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Primary Key</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key</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>Primary Key</em>' containment reference.
-	 * @see #setPrimaryKey(XmlPrimaryKey)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlMappedSuperclass_1_1_PrimaryKey()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlPrimaryKey getPrimaryKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlMappedSuperclass_1_1#getPrimaryKey <em>Primary Key</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key</em>' containment reference.
-	 * @see #getPrimaryKey()
-	 * @generated
-	 */
-	void setPrimaryKey(XmlPrimaryKey value);
-
-} // XmlMappedSuperclass_1_1
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
deleted file mode 100644
index 8388ed1714..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_1/XmlPrimaryKey_1_1.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlColumn;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Primary Key 11</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1#getValidation <em>Validation</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1#getColumns <em>Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlPrimaryKey_1_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Validation</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Validation</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Validation</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1
-	 * @see #setValidation(IdValidationType_1_1)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlPrimaryKey_1_1_Validation()
-	 * @model
-	 * @generated
-	 */
-	IdValidationType_1_1 getValidation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.XmlPrimaryKey_1_1#getValidation <em>Validation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Validation</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.IdValidationType_1_1
-	 * @see #getValidation()
-	 * @generated
-	 */
-	void setValidation(IdValidationType_1_1 value);
-
-	/**
-	 * Returns the value of the '<em><b>Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlColumn}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLinkOrmV1_1Package#getXmlPrimaryKey_1_1_Columns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlColumn> getColumns();
-
-} // XmlPrimaryKey_1_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_2/EclipseLink1_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_2/EclipseLink1_2.java
deleted file mode 100644
index 9ae73b0371..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v1_2/EclipseLink1_2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_2;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
-
-@SuppressWarnings("nls")
-public interface EclipseLink1_2
-	extends EclipseLink1_1
-{
-	String SCHEMA_NAMESPACE = EclipseLink.SCHEMA_NAMESPACE;
-	String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_1_2.xsd";
-	String SCHEMA_VERSION	= "1.2";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLink2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLink2_0.java
deleted file mode 100644
index f7663cce81..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLink2_0.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v1_1.EclipseLink1_1;
-
-@SuppressWarnings("nls")
-public interface EclipseLink2_0
-	extends EclipseLink1_1, JPA2_0
-{
-	String SCHEMA_NAMESPACE = EclipseLink.SCHEMA_NAMESPACE;
-	String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_0.xsd";
-	String SCHEMA_VERSION	= "2.0";
-	
-	// EclipseLink 2.0 specific nodes
-
-	String CACHE_INTERCEPTOR = "cache-interceptor";
-	
-	String CORRECTION_TYPE = "correction-type";
-	String MAP_KEY_ASSOCIATION_OVERRIDE = "map-key-association-override";
-
-	String QUERY_REDIRECTORS = "query-redirectors";
-	String QUERY_REDIRECTORS__ALL_QUERIES = "all-queries";
-	String QUERY_REDIRECTORS__READ_ALL = "read-all";
-	String QUERY_REDIRECTORS__READ_OBJECT = "read-object";
-	String QUERY_REDIRECTORS__REPORT = "report";
-	String QUERY_REDIRECTORS__UPDATE = "update";
-	String QUERY_REDIRECTORS__INSERT = "insert";
-	String QUERY_REDIRECTORS__DELETE = "delete";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Factory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Factory.java
deleted file mode 100644
index 9c17c127d4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Factory.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package
- * @generated
- */
-public class EclipseLinkOrmV2_0Factory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_0Factory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_0Factory init()
-	{
-		try
-		{
-			EclipseLinkOrmV2_0Factory theEclipseLinkOrmV2_0Factory = (EclipseLinkOrmV2_0Factory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.v2_0.xmi"); 
-			if (theEclipseLinkOrmV2_0Factory != null)
-			{
-				return theEclipseLinkOrmV2_0Factory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EclipseLinkOrmV2_0Factory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_0Factory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
-			case EclipseLinkOrmV2_0Package.ORDER_CORRECTION_TYPE_20:
-				return createOrderCorrectionType_2_0FromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
-			case EclipseLinkOrmV2_0Package.ORDER_CORRECTION_TYPE_20:
-				return convertOrderCorrectionType_2_0ToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OrderCorrectionType_2_0 createOrderCorrectionType_2_0FromString(EDataType eDataType, String initialValue)
-	{
-		OrderCorrectionType_2_0 result = OrderCorrectionType_2_0.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 convertOrderCorrectionType_2_0ToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_0Package getEclipseLinkOrmV2_0Package()
-	{
-		return (EclipseLinkOrmV2_0Package)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EclipseLinkOrmV2_0Package getPackage()
-	{
-		return EclipseLinkOrmV2_0Package.eINSTANCE;
-	}
-
-} //EclipseLinkOrmV2_0Factory
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
deleted file mode 100644
index 7b6ade8e55..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
+++ /dev/null
@@ -1,1526 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-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.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;
-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;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
-
-/**
- * <!-- 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.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Factory
- * @model kind="package"
- * @generated
- */
-public class EclipseLinkOrmV2_0Package extends EPackageImpl
-{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNAME = "v2_0";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_URI = "jpt.eclipselink.orm.v2_0.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_0Package eINSTANCE = org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 <em>Xml Map Key Association Override Container 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0()
-	 * @generated
-	 */
-	public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20 = 4;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Map Key Association Override Container 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0 <em>Xml Collection Mapping 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCollectionMapping_2_0()
-	 * @generated
-	 */
-	public static final int XML_COLLECTION_MAPPING_20 = 0;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_ASSOCIATION_OVERRIDES = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Collection Mapping 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_MAPPING_20_FEATURE_COUNT = XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlElementCollection_2_0()
-	 * @generated
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20 = 1;
-
-	/**
-	 * The feature id for the '<em><b>Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__ACCESS = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__NAME = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING__ACCESS_METHODS;
-
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__PROPERTIES = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING__PROPERTIES;
-
-	/**
-	 * The feature id for the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__LOB = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__TEMPORAL = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__ENUMERATED = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__CONVERTER = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__CONVERT = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__CONVERTERS = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__TYPE_CONVERTERS = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Object Type Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__OBJECT_TYPE_CONVERTERS = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 10;
-
-	/**
-	 * The feature id for the '<em><b>Struct Converters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__STRUCT_CONVERTERS = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 12;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 13;
-
-	/**
-	 * The number of structural features of the '<em>Xml Element Collection 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_20_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 14;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 <em>Xml Entity 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_20 = 2;
-
-	/**
-	 * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_20__CACHE_INTERCEPTOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_20__QUERY_REDIRECTORS = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_20_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0 <em>Xml Many To Many 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlManyToMany_2_0()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY_20 = 3;
-
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_20__CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_20__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_20__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_20__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To Many 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_20_FEATURE_COUNT = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0 <em>Xml Mapped Superclass 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMappedSuperclass_2_0()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_20 = 5;
-
-	/**
-	 * The feature id for the '<em><b>Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_20__CACHEABLE = OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Cache Interceptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR = OrmV2_0Package.XML_CACHEABLE_20_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Mapped Superclass 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_20_FEATURE_COUNT = OrmV2_0Package.XML_CACHEABLE_20_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0 <em>Xml One To Many 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOneToMany_2_0()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY_20 = 6;
-
-	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_20__CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-
-	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_20__TYPE_CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-
-	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_20__OBJECT_TYPE_CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-
-	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_20__STRUCT_CONVERTER = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_20__MAP_KEY_ASSOCIATION_OVERRIDES = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_20__MAP_KEY_CONVERT = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To Many 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_20_FEATURE_COUNT = EclipseLinkOrmPackage.XML_CONVERTER_HOLDER_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0 <em>Xml Order Column 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOrderColumn_2_0()
-	 * @generated
-	 */
-	public static final int XML_ORDER_COLUMN_20 = 7;
-
-	/**
-	 * The feature id for the '<em><b>Correction Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN_20__CORRECTION_TYPE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Order Column 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ORDER_COLUMN_20_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 <em>Xml Query Redirectors 20</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0()
-	 * @generated
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20 = 8;
-
-	/**
-	 * The feature id for the '<em><b>All Queries</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20__ALL_QUERIES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Read All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20__READ_ALL = 1;
-
-	/**
-	 * The feature id for the '<em><b>Read Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20__READ_OBJECT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Report</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20__REPORT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20__UPDATE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Insert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20__INSERT = 5;
-
-	/**
-	 * The feature id for the '<em><b>Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20__DELETE = 6;
-
-	/**
-	 * The number of structural features of the '<em>Xml Query Redirectors 20</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_QUERY_REDIRECTORS_20_FEATURE_COUNT = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0 <em>Order Correction Type 20</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getOrderCorrectionType_2_0()
-	 * @generated
-	 */
-	public static final int ORDER_CORRECTION_TYPE_20 = 9;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCollectionMapping_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlElementCollection_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntity_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToMany_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMapKeyAssociationOverrideContainer_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclass_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToMany_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOrderColumn_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlQueryRedirectors_2_0EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum orderCorrectionType_2_0EEnum = 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.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EclipseLinkOrmV2_0Package()
-	{
-		super(eNS_URI, EclipseLinkOrmV2_0Factory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link EclipseLinkOrmV2_0Package#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_0Package init()
-	{
-		if (isInited) return (EclipseLinkOrmV2_0Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI);
-
-		// Obtain or create and register package
-		EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV2_0Package());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
-		EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
-		EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
-		EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) : EclipseLinkOrmV2_2Package.eINSTANCE);
-		EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) : EclipseLinkOrmV2_3Package.eINSTANCE);
-		EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) : EclipseLinkOrmV2_4Package.eINSTANCE);
-
-		// Create package meta-data objects
-		theEclipseLinkOrmV2_0Package.createPackageContents();
-		theEclipseLinkOrmPackage.createPackageContents();
-		theEclipseLinkOrmV1_1Package.createPackageContents();
-		theEclipseLinkOrmV2_1Package.createPackageContents();
-		theEclipseLinkOrmV2_2Package.createPackageContents();
-		theEclipseLinkOrmV2_3Package.createPackageContents();
-		theEclipseLinkOrmV2_4Package.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLinkOrmV2_0Package.initializePackageContents();
-		theEclipseLinkOrmPackage.initializePackageContents();
-		theEclipseLinkOrmV1_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_2Package.initializePackageContents();
-		theEclipseLinkOrmV2_3Package.initializePackageContents();
-		theEclipseLinkOrmV2_4Package.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLinkOrmV2_0Package.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(EclipseLinkOrmV2_0Package.eNS_URI, theEclipseLinkOrmV2_0Package);
-		return theEclipseLinkOrmV2_0Package;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0 <em>Xml Collection Mapping 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Collection Mapping 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0
-	 * @generated
-	 */
-	public EClass getXmlCollectionMapping_2_0()
-	{
-		return xmlCollectionMapping_2_0EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0#getMapKeyConvert <em>Map Key Convert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Map Key Convert</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0#getMapKeyConvert()
-	 * @see #getXmlCollectionMapping_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlCollectionMapping_2_0_MapKeyConvert()
-	{
-		return (EAttribute)xmlCollectionMapping_2_0EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Element Collection 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0
-	 * @generated
-	 */
-	public EClass getXmlElementCollection_2_0()
-	{
-		return xmlElementCollection_2_0EClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 <em>Xml Entity 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0
-	 * @generated
-	 */
-	public EClass getXmlEntity_2_0()
-	{
-		return xmlEntity_2_0EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor <em>Cache Interceptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cache Interceptor</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor()
-	 * @see #getXmlEntity_2_0()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_0_CacheInterceptor()
-	{
-		return (EReference)xmlEntity_2_0EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors <em>Query Redirectors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Query Redirectors</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors()
-	 * @see #getXmlEntity_2_0()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_0_QueryRedirectors()
-	{
-		return (EReference)xmlEntity_2_0EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0 <em>Xml Many To Many 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To Many 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0
-	 * @generated
-	 */
-	public EClass getXmlManyToMany_2_0()
-	{
-		return xmlManyToMany_2_0EClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 <em>Xml Map Key Association Override Container 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Map Key Association Override Container 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0
-	 * @generated
-	 */
-	public EClass getXmlMapKeyAssociationOverrideContainer_2_0()
-	{
-		return xmlMapKeyAssociationOverrideContainer_2_0EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Map Key Association Overrides</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0#getMapKeyAssociationOverrides()
-	 * @see #getXmlMapKeyAssociationOverrideContainer_2_0()
-	 * @generated
-	 */
-	public EReference getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()
-	{
-		return (EReference)xmlMapKeyAssociationOverrideContainer_2_0EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0 <em>Xml Mapped Superclass 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mapped Superclass 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass_2_0()
-	{
-		return xmlMappedSuperclass_2_0EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0#getCacheInterceptor <em>Cache Interceptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cache Interceptor</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0#getCacheInterceptor()
-	 * @see #getXmlMappedSuperclass_2_0()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_0_CacheInterceptor()
-	{
-		return (EReference)xmlMappedSuperclass_2_0EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0 <em>Xml One To Many 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To Many 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0
-	 * @generated
-	 */
-	public EClass getXmlOneToMany_2_0()
-	{
-		return xmlOneToMany_2_0EClass;
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0 <em>Xml Order Column 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Order Column 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0
-	 * @generated
-	 */
-	public EClass getXmlOrderColumn_2_0()
-	{
-		return xmlOrderColumn_2_0EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0#getCorrectionType <em>Correction Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Correction Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0#getCorrectionType()
-	 * @see #getXmlOrderColumn_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlOrderColumn_2_0_CorrectionType()
-	{
-		return (EAttribute)xmlOrderColumn_2_0EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 <em>Xml Query Redirectors 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Query Redirectors 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0
-	 * @generated
-	 */
-	public EClass getXmlQueryRedirectors_2_0()
-	{
-		return xmlQueryRedirectors_2_0EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getAllQueries <em>All Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>All Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getAllQueries()
-	 * @see #getXmlQueryRedirectors_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryRedirectors_2_0_AllQueries()
-	{
-		return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadAll <em>Read All</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Read All</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadAll()
-	 * @see #getXmlQueryRedirectors_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryRedirectors_2_0_ReadAll()
-	{
-		return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadObject <em>Read Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Read Object</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadObject()
-	 * @see #getXmlQueryRedirectors_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryRedirectors_2_0_ReadObject()
-	{
-		return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReport <em>Report</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Report</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReport()
-	 * @see #getXmlQueryRedirectors_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryRedirectors_2_0_Report()
-	{
-		return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getUpdate <em>Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Update</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getUpdate()
-	 * @see #getXmlQueryRedirectors_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryRedirectors_2_0_Update()
-	{
-		return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getInsert <em>Insert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Insert</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getInsert()
-	 * @see #getXmlQueryRedirectors_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryRedirectors_2_0_Insert()
-	{
-		return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getDelete <em>Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Delete</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getDelete()
-	 * @see #getXmlQueryRedirectors_2_0()
-	 * @generated
-	 */
-	public EAttribute getXmlQueryRedirectors_2_0_Delete()
-	{
-		return (EAttribute)xmlQueryRedirectors_2_0EClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0 <em>Order Correction Type 20</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Order Correction Type 20</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0
-	 * @generated
-	 */
-	public EEnum getOrderCorrectionType_2_0()
-	{
-		return orderCorrectionType_2_0EEnum;
-	}
-
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_0Factory getEclipseLinkOrmV2_0Factory()
-	{
-		return (EclipseLinkOrmV2_0Factory)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
-		xmlCollectionMapping_2_0EClass = createEClass(XML_COLLECTION_MAPPING_20);
-		createEAttribute(xmlCollectionMapping_2_0EClass, XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT);
-
-		xmlElementCollection_2_0EClass = createEClass(XML_ELEMENT_COLLECTION_20);
-
-		xmlEntity_2_0EClass = createEClass(XML_ENTITY_20);
-		createEReference(xmlEntity_2_0EClass, XML_ENTITY_20__CACHE_INTERCEPTOR);
-		createEReference(xmlEntity_2_0EClass, XML_ENTITY_20__QUERY_REDIRECTORS);
-
-		xmlManyToMany_2_0EClass = createEClass(XML_MANY_TO_MANY_20);
-
-		xmlMapKeyAssociationOverrideContainer_2_0EClass = createEClass(XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20);
-		createEReference(xmlMapKeyAssociationOverrideContainer_2_0EClass, XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES);
-
-		xmlMappedSuperclass_2_0EClass = createEClass(XML_MAPPED_SUPERCLASS_20);
-		createEReference(xmlMappedSuperclass_2_0EClass, XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR);
-
-		xmlOneToMany_2_0EClass = createEClass(XML_ONE_TO_MANY_20);
-
-		xmlOrderColumn_2_0EClass = createEClass(XML_ORDER_COLUMN_20);
-		createEAttribute(xmlOrderColumn_2_0EClass, XML_ORDER_COLUMN_20__CORRECTION_TYPE);
-
-		xmlQueryRedirectors_2_0EClass = createEClass(XML_QUERY_REDIRECTORS_20);
-		createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__ALL_QUERIES);
-		createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__READ_ALL);
-		createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__READ_OBJECT);
-		createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__REPORT);
-		createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__UPDATE);
-		createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__INSERT);
-		createEAttribute(xmlQueryRedirectors_2_0EClass, XML_QUERY_REDIRECTORS_20__DELETE);
-
-		// Create enums
-		orderCorrectionType_2_0EEnum = createEEnum(ORDER_CORRECTION_TYPE_20);
-	}
-
-	/**
-	 * <!-- 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
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
-		OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
-		OrmV2_0Package theOrmV2_0Package = (OrmV2_0Package)EPackage.Registry.INSTANCE.getEPackage(OrmV2_0Package.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		xmlCollectionMapping_2_0EClass.getESuperTypes().add(this.getXmlMapKeyAssociationOverrideContainer_2_0());
-		xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAttributeMapping());
-		xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConvertibleMapping());
-		xmlElementCollection_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConvertersHolder());
-		xmlElementCollection_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0());
-		xmlManyToMany_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConverterHolder());
-		xmlManyToMany_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0());
-		xmlMappedSuperclass_2_0EClass.getESuperTypes().add(theOrmV2_0Package.getXmlCacheable_2_0());
-		xmlOneToMany_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConverterHolder());
-		xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlCollectionMapping_2_0EClass, XmlCollectionMapping_2_0.class, "XmlCollectionMapping_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlCollectionMapping_2_0_MapKeyConvert(), theXMLTypePackage.getString(), "mapKeyConvert", null, 0, 1, XmlCollectionMapping_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlElementCollection_2_0EClass, XmlElementCollection_2_0.class, "XmlElementCollection_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEntity_2_0EClass, XmlEntity_2_0.class, "XmlEntity_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntity_2_0_CacheInterceptor(), theOrmPackage.getXmlClassReference(), null, "cacheInterceptor", null, 0, 1, XmlEntity_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_2_0_QueryRedirectors(), theEclipseLinkOrmPackage.getXmlQueryRedirectors(), null, "queryRedirectors", null, 0, 1, XmlEntity_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlManyToMany_2_0EClass, XmlManyToMany_2_0.class, "XmlManyToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlMapKeyAssociationOverrideContainer_2_0EClass, XmlMapKeyAssociationOverrideContainer_2_0.class, "XmlMapKeyAssociationOverrideContainer_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides(), theOrmPackage.getXmlAssociationOverride(), null, "mapKeyAssociationOverrides", null, 0, -1, XmlMapKeyAssociationOverrideContainer_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMappedSuperclass_2_0EClass, XmlMappedSuperclass_2_0.class, "XmlMappedSuperclass_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMappedSuperclass_2_0_CacheInterceptor(), theOrmPackage.getXmlClassReference(), null, "cacheInterceptor", null, 0, 1, XmlMappedSuperclass_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToMany_2_0EClass, XmlOneToMany_2_0.class, "XmlOneToMany_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlOrderColumn_2_0EClass, XmlOrderColumn_2_0.class, "XmlOrderColumn_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlOrderColumn_2_0_CorrectionType(), this.getOrderCorrectionType_2_0(), "correctionType", null, 0, 1, XmlOrderColumn_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlQueryRedirectors_2_0EClass, XmlQueryRedirectors_2_0.class, "XmlQueryRedirectors_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlQueryRedirectors_2_0_AllQueries(), theXMLTypePackage.getString(), "allQueries", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlQueryRedirectors_2_0_ReadAll(), theXMLTypePackage.getString(), "readAll", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlQueryRedirectors_2_0_ReadObject(), theXMLTypePackage.getString(), "readObject", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlQueryRedirectors_2_0_Report(), theXMLTypePackage.getString(), "report", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlQueryRedirectors_2_0_Update(), theXMLTypePackage.getString(), "update", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlQueryRedirectors_2_0_Insert(), theXMLTypePackage.getString(), "insert", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlQueryRedirectors_2_0_Delete(), theXMLTypePackage.getString(), "delete", null, 0, 1, XmlQueryRedirectors_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(orderCorrectionType_2_0EEnum, OrderCorrectionType_2_0.class, "OrderCorrectionType_2_0");
-		addEEnumLiteral(orderCorrectionType_2_0EEnum, OrderCorrectionType_2_0.READ);
-		addEEnumLiteral(orderCorrectionType_2_0EEnum, OrderCorrectionType_2_0.READ_WRITE);
-		addEEnumLiteral(orderCorrectionType_2_0EEnum, OrderCorrectionType_2_0.EXCEPTION);
-	}
-
-	/**
-	 * <!-- 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.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0 <em>Xml Collection Mapping 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCollectionMapping_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_COLLECTION_MAPPING_20 = eINSTANCE.getXmlCollectionMapping_2_0();
-
-		/**
-		 * The meta object literal for the '<em><b>Map Key Convert</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_COLLECTION_MAPPING_20__MAP_KEY_CONVERT = eINSTANCE.getXmlCollectionMapping_2_0_MapKeyConvert();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0 <em>Xml Element Collection 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlElementCollection_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlElementCollection_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_ELEMENT_COLLECTION_20 = eINSTANCE.getXmlElementCollection_2_0();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0 <em>Xml Entity 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_20 = eINSTANCE.getXmlEntity_2_0();
-
-		/**
-		 * The meta object literal for the '<em><b>Cache Interceptor</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_20__CACHE_INTERCEPTOR = eINSTANCE.getXmlEntity_2_0_CacheInterceptor();
-
-		/**
-		 * The meta object literal for the '<em><b>Query Redirectors</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_20__QUERY_REDIRECTORS = eINSTANCE.getXmlEntity_2_0_QueryRedirectors();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0 <em>Xml Many To Many 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlManyToMany_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlManyToMany_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY_20 = eINSTANCE.getXmlManyToMany_2_0();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0 <em>Xml Map Key Association Override Container 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20 = eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0();
-
-		/**
-		 * The meta object literal for the '<em><b>Map Key Association Overrides</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAP_KEY_ASSOCIATION_OVERRIDE_CONTAINER_20__MAP_KEY_ASSOCIATION_OVERRIDES = eINSTANCE.getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0 <em>Xml Mapped Superclass 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMappedSuperclass_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPED_SUPERCLASS_20 = eINSTANCE.getXmlMappedSuperclass_2_0();
-
-		/**
-		 * The meta object literal for the '<em><b>Cache Interceptor</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_20__CACHE_INTERCEPTOR = eINSTANCE.getXmlMappedSuperclass_2_0_CacheInterceptor();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0 <em>Xml One To Many 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOneToMany_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY_20 = eINSTANCE.getXmlOneToMany_2_0();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0 <em>Xml Order Column 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOrderColumn_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_ORDER_COLUMN_20 = eINSTANCE.getXmlOrderColumn_2_0();
-
-		/**
-		 * The meta object literal for the '<em><b>Correction Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ORDER_COLUMN_20__CORRECTION_TYPE = eINSTANCE.getXmlOrderColumn_2_0_CorrectionType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0 <em>Xml Query Redirectors 20</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0()
-		 * @generated
-		 */
-		public static final EClass XML_QUERY_REDIRECTORS_20 = eINSTANCE.getXmlQueryRedirectors_2_0();
-
-		/**
-		 * The meta object literal for the '<em><b>All Queries</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_QUERY_REDIRECTORS_20__ALL_QUERIES = eINSTANCE.getXmlQueryRedirectors_2_0_AllQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Read All</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_QUERY_REDIRECTORS_20__READ_ALL = eINSTANCE.getXmlQueryRedirectors_2_0_ReadAll();
-
-		/**
-		 * The meta object literal for the '<em><b>Read Object</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_QUERY_REDIRECTORS_20__READ_OBJECT = eINSTANCE.getXmlQueryRedirectors_2_0_ReadObject();
-
-		/**
-		 * The meta object literal for the '<em><b>Report</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_QUERY_REDIRECTORS_20__REPORT = eINSTANCE.getXmlQueryRedirectors_2_0_Report();
-
-		/**
-		 * The meta object literal for the '<em><b>Update</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_QUERY_REDIRECTORS_20__UPDATE = eINSTANCE.getXmlQueryRedirectors_2_0_Update();
-
-		/**
-		 * The meta object literal for the '<em><b>Insert</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_QUERY_REDIRECTORS_20__INSERT = eINSTANCE.getXmlQueryRedirectors_2_0_Insert();
-
-		/**
-		 * The meta object literal for the '<em><b>Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_QUERY_REDIRECTORS_20__DELETE = eINSTANCE.getXmlQueryRedirectors_2_0_Delete();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0 <em>Order Correction Type 20</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getOrderCorrectionType_2_0()
-		 * @generated
-		 */
-		public static final EEnum ORDER_CORRECTION_TYPE_20 = eINSTANCE.getOrderCorrectionType_2_0();
-
-	}
-
-} //EclipseLinkOrmV2_0Package
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/OrderCorrectionType_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/OrderCorrectionType_2_0.java
deleted file mode 100644
index d9a1f50eb9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/OrderCorrectionType_2_0.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009, 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Order Column Correction Type 20</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getOrderCorrectionType_2_0()
- * @model
- * @generated
- */
-public enum OrderCorrectionType_2_0 implements Enumerator
-{
-	/**
-	 * The '<em><b>READ</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #READ_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	READ(0, "READ", "READ"),
-
-	/**
-	 * The '<em><b>READ WRITE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #READ_WRITE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	READ_WRITE(1, "READ_WRITE", "READ_WRITE"),
-
-	/**
-	 * The '<em><b>EXCEPTION</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXCEPTION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EXCEPTION(2, "EXCEPTION", "EXCEPTION");
-
-	/**
-	 * The '<em><b>READ</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>READ</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #READ
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int READ_VALUE = 0;
-
-	/**
-	 * The '<em><b>READ WRITE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>READ WRITE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #READ_WRITE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int READ_WRITE_VALUE = 1;
-
-	/**
-	 * The '<em><b>EXCEPTION</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EXCEPTION</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXCEPTION
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXCEPTION_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Order Correction Type 20</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final OrderCorrectionType_2_0[] VALUES_ARRAY =
-		new OrderCorrectionType_2_0[]
-		{
-			READ,
-			READ_WRITE,
-			EXCEPTION,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Order Correction Type 20</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<OrderCorrectionType_2_0> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Order Correction Type 20</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static OrderCorrectionType_2_0 get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			OrderCorrectionType_2_0 result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Order Correction Type 20</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static OrderCorrectionType_2_0 getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			OrderCorrectionType_2_0 result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Order Correction Type 20</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static OrderCorrectionType_2_0 get(int value)
-	{
-		switch (value)
-		{
-			case READ_VALUE: return READ;
-			case READ_WRITE_VALUE: return READ_WRITE;
-			case EXCEPTION_VALUE: return EXCEPTION;
-		}
-		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 OrderCorrectionType_2_0(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;
-	}
-	
-} //OrderColumnCorrectionType_2_0
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
deleted file mode 100644
index 1c09a599ea..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCacheInterceptor_2_0.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Cache Interceptor2 0</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0#getClassName <em>Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlCacheInterceptor_2_0 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class Name</em>' attribute.
-	 * @see #setClassName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCacheInterceptor_2_0_ClassName()
-	 * @model
-	 * @generated
-	 */
-	String getClassName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCacheInterceptor_2_0#getClassName <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Name</em>' attribute.
-	 * @see #getClassName()
-	 * @generated
-	 */
-	void setClassName(String value);
-
-} // XmlCacheInterceptor2_0
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java
deleted file mode 100644
index d355767009..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlCollectionMapping_2_0.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009, 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Collection Mapping 20</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0#getMapKeyConvert <em>Map Key Convert</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCollectionMapping_2_0()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlCollectionMapping_2_0 extends XmlMapKeyAssociationOverrideContainer_2_0
-{
-	/**
-	 * Returns the value of the '<em><b>Map Key Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key Convert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key Convert</em>' attribute.
-	 * @see #setMapKeyConvert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlCollectionMapping_2_0_MapKeyConvert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getMapKeyConvert();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlCollectionMapping_2_0#getMapKeyConvert <em>Map Key Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map Key Convert</em>' attribute.
-	 * @see #getMapKeyConvert()
-	 * @generated
-	 */
-	void setMapKeyConvert(String value);
-
-} // XmlCollectionMapping_2_0
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlElementCollection_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlElementCollection_2_0.java
deleted file mode 100644
index 4b32697f58..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlElementCollection_2_0.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertersHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Element Collection 20</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlElementCollection_2_0()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlElementCollection_2_0 extends XmlAttributeMapping, XmlConvertibleMapping, XmlConvertersHolder, XmlCollectionMapping_2_0
-{
-}
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
deleted file mode 100644
index 142a7d844f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlEntity_2_0.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity2 0</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor <em>Cache Interceptor</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors <em>Query Redirectors</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlEntity_2_0 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cache Interceptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Interceptor</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>Cache Interceptor</em>' containment reference.
-	 * @see #setCacheInterceptor(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0_CacheInterceptor()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlClassReference getCacheInterceptor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Interceptor</em>' containment reference.
-	 * @see #getCacheInterceptor()
-	 * @generated
-	 */
-	void setCacheInterceptor(XmlClassReference value);
-
-	/**
-	 * Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query Redirectors</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query Redirectors</em>' containment reference.
-	 * @see #setQueryRedirectors(XmlQueryRedirectors)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlEntity_2_0_QueryRedirectors()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlQueryRedirectors getQueryRedirectors();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlEntity_2_0#getQueryRedirectors <em>Query Redirectors</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query Redirectors</em>' containment reference.
-	 * @see #getQueryRedirectors()
-	 * @generated
-	 */
-	void setQueryRedirectors(XmlQueryRedirectors value);
-
-} // XmlEntity2_0
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlManyToMany_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlManyToMany_2_0.java
deleted file mode 100644
index 31bb9c6e53..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlManyToMany_2_0.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To Many 20</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlManyToMany_2_0()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToMany_2_0 extends XmlConverterHolder, XmlCollectionMapping_2_0
-{
-}
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
deleted file mode 100644
index 5e56cca4f4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMapKeyAssociationOverrideContainer_2_0.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Map Key Association Override Container2 0</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMapKeyAssociationOverrideContainer_2_0#getMapKeyAssociationOverrides <em>Map Key Association Overrides</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlMapKeyAssociationOverrideContainer_2_0 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Map Key Association Overrides</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Key Association Overrides</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Key Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMapKeyAssociationOverrideContainer_2_0_MapKeyAssociationOverrides()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlAssociationOverride> getMapKeyAssociationOverrides();
-
-} // XmlMapKeyAssociationOverrideContainer2_0
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java
deleted file mode 100644
index 20cb2803d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCacheable_2_0;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Mapped Superclass 20</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0#getCacheInterceptor <em>Cache Interceptor</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMappedSuperclass_2_0()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlMappedSuperclass_2_0 extends XmlCacheable_2_0
-{
-
-	/**
-	 * Returns the value of the '<em><b>Cache Interceptor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Interceptor</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>Cache Interceptor</em>' containment reference.
-	 * @see #setCacheInterceptor(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlMappedSuperclass_2_0_CacheInterceptor()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlClassReference getCacheInterceptor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlMappedSuperclass_2_0#getCacheInterceptor <em>Cache Interceptor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Interceptor</em>' containment reference.
-	 * @see #getCacheInterceptor()
-	 * @generated
-	 */
-	void setCacheInterceptor(XmlClassReference value);
-
-} // XmlMappedSuperclass_2_0
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOneToMany_2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOneToMany_2_0.java
deleted file mode 100644
index ad28f54969..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOneToMany_2_0.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConverterHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To Many 20</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOneToMany_2_0()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToMany_2_0 extends XmlConverterHolder, XmlCollectionMapping_2_0
-{
-}
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
deleted file mode 100644
index f7c5c71ed6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlOrderColumn_2_0.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Order Column 20</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0#getCorrectionType <em>Correction Type</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlOrderColumn_2_0 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Correction Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Correction 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>Correction Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0
-	 * @see #setCorrectionType(OrderCorrectionType_2_0)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlOrderColumn_2_0_CorrectionType()
-	 * @model
-	 * @generated
-	 */
-	OrderCorrectionType_2_0 getCorrectionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlOrderColumn_2_0#getCorrectionType <em>Correction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Correction Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.OrderCorrectionType_2_0
-	 * @see #getCorrectionType()
-	 * @generated
-	 */
-	void setCorrectionType(OrderCorrectionType_2_0 value);
-
-} // XmlOrderColumn_2_0
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
deleted file mode 100644
index 38fa1162ce..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_0/XmlQueryRedirectors_2_0.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Query Redirectors2 0</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getAllQueries <em>All Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadAll <em>Read All</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadObject <em>Read Object</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReport <em>Report</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getUpdate <em>Update</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getInsert <em>Insert</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getDelete <em>Delete</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlQueryRedirectors_2_0 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>All Queries</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>All Queries</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>All Queries</em>' attribute.
-	 * @see #setAllQueries(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_AllQueries()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAllQueries();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getAllQueries <em>All Queries</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>All Queries</em>' attribute.
-	 * @see #getAllQueries()
-	 * @generated
-	 */
-	void setAllQueries(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Read All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read All</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 All</em>' attribute.
-	 * @see #setReadAll(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_ReadAll()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getReadAll();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadAll <em>Read All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read All</em>' attribute.
-	 * @see #getReadAll()
-	 * @generated
-	 */
-	void setReadAll(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Read Object</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read Object</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 Object</em>' attribute.
-	 * @see #setReadObject(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_ReadObject()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getReadObject();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReadObject <em>Read Object</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Object</em>' attribute.
-	 * @see #getReadObject()
-	 * @generated
-	 */
-	void setReadObject(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Report</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Report</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Report</em>' attribute.
-	 * @see #setReport(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_Report()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getReport();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getReport <em>Report</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Report</em>' attribute.
-	 * @see #getReport()
-	 * @generated
-	 */
-	void setReport(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Update</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Update</em>' attribute.
-	 * @see #setUpdate(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_Update()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getUpdate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getUpdate <em>Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Update</em>' attribute.
-	 * @see #getUpdate()
-	 * @generated
-	 */
-	void setUpdate(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Insert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Insert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Insert</em>' attribute.
-	 * @see #setInsert(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_Insert()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getInsert();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getInsert <em>Insert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Insert</em>' attribute.
-	 * @see #getInsert()
-	 * @generated
-	 */
-	void setInsert(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delete</em>' attribute.
-	 * @see #setDelete(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLinkOrmV2_0Package#getXmlQueryRedirectors_2_0_Delete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.XmlQueryRedirectors_2_0#getDelete <em>Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delete</em>' attribute.
-	 * @see #getDelete()
-	 * @generated
-	 */
-	void setDelete(String value);
-
-} // XmlQueryRedirectors2_0
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
deleted file mode 100644
index 6dda927b61..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/BatchFetchType_2_1.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Batch Fetch Type 21</b></em>',
- * and utility methods for working with them.
- *  
- * 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.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getBatchFetchType_2_1()
- * @model
- * @generated
- */
-public enum BatchFetchType_2_1 implements Enumerator
-{
-	/**
-	 * The '<em><b>JOIN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JOIN_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	JOIN(0, "JOIN", "JOIN"),
-
-	/**
-	 * The '<em><b>EXISTS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXISTS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EXISTS(1, "EXISTS", "EXISTS"),
-
-	/**
-	 * The '<em><b>IN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IN_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IN(2, "IN", "IN");
-
-	/**
-	 * The '<em><b>JOIN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>JOIN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JOIN
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JOIN_VALUE = 0;
-
-	/**
-	 * The '<em><b>EXISTS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EXISTS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXISTS
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXISTS_VALUE = 1;
-
-	/**
-	 * The '<em><b>IN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>IN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IN
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IN_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Batch Fetch Type 21</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final BatchFetchType_2_1[] VALUES_ARRAY =
-		new BatchFetchType_2_1[]
-		{
-			JOIN,
-			EXISTS,
-			IN,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Batch Fetch Type 21</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<BatchFetchType_2_1> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Batch Fetch Type 21</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BatchFetchType_2_1 get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			BatchFetchType_2_1 result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Batch Fetch Type 21</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BatchFetchType_2_1 getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			BatchFetchType_2_1 result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Batch Fetch Type 21</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BatchFetchType_2_1 get(int value)
-	{
-		switch (value)
-		{
-			case JOIN_VALUE: return JOIN;
-			case EXISTS_VALUE: return EXISTS;
-			case IN_VALUE: return IN;
-		}
-		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 BatchFetchType_2_1(int value, String name, String literal)
-	{
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue()
-	{
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName()
-	{
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral()
-	{
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		return literal;
-	}
-	
-} //BatchFetchType_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java
deleted file mode 100644
index 6d36604765..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Cache Key Type 21</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getCacheKeyType_2_1()
- * @model
- * @generated
- */
-public enum CacheKeyType_2_1 implements Enumerator
-{
-	/**
-	 * The '<em><b>ID VALUE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ID_VALUE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ID_VALUE(0, "ID_VALUE", "ID_VALUE"),
-
-	/**
-	 * The '<em><b>CACHE KEY</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CACHE_KEY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CACHE_KEY(1, "CACHE_KEY", "CACHE_KEY"),
-
-	/**
-	 * The '<em><b>AUTO</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #AUTO_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	AUTO(2, "AUTO", "AUTO");
-
-	/**
-	 * The '<em><b>ID VALUE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ID VALUE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ID_VALUE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ID_VALUE_VALUE = 0;
-
-	/**
-	 * The '<em><b>CACHE KEY</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CACHE KEY</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CACHE_KEY
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CACHE_KEY_VALUE = 1;
-
-	/**
-	 * The '<em><b>AUTO</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>AUTO</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AUTO
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int AUTO_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Cache Key Type 21</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final CacheKeyType_2_1[] VALUES_ARRAY =
-		new CacheKeyType_2_1[]
-		{
-			ID_VALUE,
-			CACHE_KEY,
-			AUTO,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Cache Key Type 21</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<CacheKeyType_2_1> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Cache Key Type 21</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheKeyType_2_1 get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			CacheKeyType_2_1 result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cache Key Type 21</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheKeyType_2_1 getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			CacheKeyType_2_1 result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cache Key Type 21</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CacheKeyType_2_1 get(int value)
-	{
-		switch (value)
-		{
-			case ID_VALUE_VALUE: return ID_VALUE;
-			case CACHE_KEY_VALUE: return CACHE_KEY;
-			case AUTO_VALUE: return AUTO;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private CacheKeyType_2_1(int value, String name, String literal)
-	{
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue()
-	{
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName()
-	{
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral()
-	{
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		return literal;
-	}
-	
-} //CacheKeyType_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java
deleted file mode 100644
index 5bd544a267..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLink2_1.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_0.EclipseLink2_0;
-
-@SuppressWarnings("nls")
-public interface EclipseLink2_1
-	extends EclipseLink2_0
-{
-	String SCHEMA_NAMESPACE = EclipseLink.SCHEMA_NAMESPACE;
-	String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_1.xsd";
-	String SCHEMA_VERSION	= "2.1";
-	
-	
-	// EclipseLink 2.1 specific nodes
-	
-	String ATTRIBUTE = "attribute";
-	String ATTRIBUTE_TYPE = "attribute-type";
-	String BATCH_FETCH = "batch-fetch";
-		String BATCH_FETCH__SIZE = "size";
-		String BATCH_FETCH__TYPE = "type";
-	String CACHE_KEY_TYPE = "cache-key-type";
-	String CLASS_EXTRACTOR = "class-extractor";
-	String FETCH_GROUP = "fetch-group";
-		String FETCH_GROUP__LOAD = "load";
-	String PARENT_CLASS = "parent-class";
-	String RETURN_INSERT = "return-insert";
-	String RETURN_ONLY = "return-only";
-	String RETURN_UPDATE = "return-update";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java
deleted file mode 100644
index b3d74cbfef..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Factory.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package
- * @generated
- */
-public class EclipseLinkOrmV2_1Factory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_1Factory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_1Factory init()
-	{
-		try
-		{
-			EclipseLinkOrmV2_1Factory theEclipseLinkOrmV2_1Factory = (EclipseLinkOrmV2_1Factory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.v2_1.xmi"); 
-			if (theEclipseLinkOrmV2_1Factory != null)
-			{
-				return theEclipseLinkOrmV2_1Factory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EclipseLinkOrmV2_1Factory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_1Factory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
-			case EclipseLinkOrmV2_1Package.CACHE_KEY_TYPE_21:
-				return createCacheKeyType_2_1FromString(eDataType, initialValue);
-			case EclipseLinkOrmV2_1Package.BATCH_FETCH_TYPE_21:
-				return createBatchFetchType_2_1FromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
-			case EclipseLinkOrmV2_1Package.CACHE_KEY_TYPE_21:
-				return convertCacheKeyType_2_1ToString(eDataType, instanceValue);
-			case EclipseLinkOrmV2_1Package.BATCH_FETCH_TYPE_21:
-				return convertBatchFetchType_2_1ToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CacheKeyType_2_1 createCacheKeyType_2_1FromString(EDataType eDataType, String initialValue)
-	{
-		CacheKeyType_2_1 result = CacheKeyType_2_1.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCacheKeyType_2_1ToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BatchFetchType_2_1 createBatchFetchType_2_1FromString(EDataType eDataType, String initialValue)
-	{
-		BatchFetchType_2_1 result = BatchFetchType_2_1.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertBatchFetchType_2_1ToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_1Package getEclipseLinkOrmV2_1Package()
-	{
-		return (EclipseLinkOrmV2_1Package)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EclipseLinkOrmV2_1Package getPackage()
-	{
-		return EclipseLinkOrmV2_1Package.eINSTANCE;
-	}
-
-} //EclipseLinkOrmV2_1Factory
diff --git a/jpa/plugins/org.eclipse.jpt.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
deleted file mode 100644
index 22a2392882..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
+++ /dev/null
@@ -1,2567 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010, 2011  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jpt.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_2.EclipseLinkOrmV2_2Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
-
-/**
- * <!-- 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.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Factory
- * @model kind="package"
- * @generated
- */
-public class EclipseLinkOrmV2_1Package extends EPackageImpl
-{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNAME = "v2_1";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_URI = "jpt.eclipselink.orm.v2_1.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_1Package eINSTANCE = org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1 <em>Xml Basic 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1()
-	 * @generated
-	 */
-	public static final int XML_BASIC_21 = 0;
-
-	/**
-	 * The feature id for the '<em><b>Return Insert</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_21__RETURN_INSERT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Return Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_21__RETURN_UPDATE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_21__ATTRIBUTE_TYPE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_21_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 <em>Xml Batch Fetch 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1()
-	 * @generated
-	 */
-	public static final int XML_BATCH_FETCH_21 = 1;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BATCH_FETCH_21__SIZE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Batch Fetch Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BATCH_FETCH_21__BATCH_FETCH_TYPE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Batch Fetch 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BATCH_FETCH_21_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 <em>Xml Element Collection 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlElementCollection_2_1()
-	 * @generated
-	 */
-	public static final int XML_ELEMENT_COLLECTION_21 = 2;
-
-	/**
-	 * The feature id for the '<em><b>Join Fetch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_21__JOIN_FETCH = EclipseLinkOrmPackage.XML_JOIN_FETCH__JOIN_FETCH;
-
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_JOIN_FETCH_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE = EclipseLinkOrmPackage.XML_JOIN_FETCH_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Element Collection 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_JOIN_FETCH_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 <em>Xml Embeddable 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddable_2_1()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDABLE_21 = 3;
-
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_21__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embeddable 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 <em>Xml Embedded 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbedded_2_1()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_21 = 4;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_21__ATTRIBUTE_TYPE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embedded 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 <em>Xml Embedded Id 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddedId_2_1()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDED_ID_21 = 5;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embedded Id 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDED_ID_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1()
-	 * @generated
-	 */
-	public static final int XML_FETCH_GROUP_CONTAINER_21 = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_21 = 6;
-
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_21__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-
-	/**
-	 * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_21__FETCH_GROUPS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Class Extractor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_21__CLASS_EXTRACTOR = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_21__PARENT_CLASS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntityMappings_2_1()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_MAPPINGS_21 = 7;
-
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_21__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity Mappings 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1()
-	 * @generated
-	 */
-	public static final int XML_FETCH_ATTRIBUTE_21 = 8;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_ATTRIBUTE_21__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Fetch Attribute 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_ATTRIBUTE_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1 <em>Xml Fetch Group 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1()
-	 * @generated
-	 */
-	public static final int XML_FETCH_GROUP_21 = 9;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP_21__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Load</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP_21__LOAD = 1;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP_21__ATTRIBUTES = 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Fetch Group 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP_21_FEATURE_COUNT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Fetch Group Container 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_FETCH_GROUP_CONTAINER_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1 <em>Xml Id 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlId_2_1()
-	 * @generated
-	 */
-	public static final int XML_ID_21 = 11;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_21__ATTRIBUTE_TYPE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Id 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 <em>Xml Many To Many 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToMany_2_1()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY_21 = 12;
-
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To Many 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 <em>Xml Many To One 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToOne_2_1()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE_21 = 13;
-
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To One 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21 = 14;
-
-	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__ASSOCIATION_OVERRIDES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER__ASSOCIATION_OVERRIDES;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__ATTRIBUTE_OVERRIDES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Fetch Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__FETCH_GROUPS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Sequence Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__SEQUENCE_GENERATOR = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Table Generator</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__TABLE_GENERATOR = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Named Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__NAMED_QUERIES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Named Native Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__NAMED_NATIVE_QUERIES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Named Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__NAMED_STORED_PROCEDURE_QUERIES = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__ACCESS_METHODS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Query Redirectors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21__PARENT_CLASS = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 10;
-
-	/**
-	 * The number of structural features of the '<em>Xml Mapped Superclass 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_21_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToMany_2_1()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY_21 = 15;
-
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To Many 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 <em>Xml One To One 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToOne_2_1()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE_21 = 16;
-
-	/**
-	 * The feature id for the '<em><b>Batch Fetch</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_21__BATCH_FETCH = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER__BATCH_FETCH;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To One 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BATCH_FETCH_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 <em>Xml Persistence Unit Defaults 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPersistenceUnitDefaults_2_1()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_21 = 17;
-
-	/**
-	 * The feature id for the '<em><b>Access Methods</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_21__ACCESS_METHODS = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER__ACCESS_METHODS;
-
-	/**
-	 * The number of structural features of the '<em>Xml Persistence Unit Defaults 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_21_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ACCESS_METHODS_HOLDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1()
-	 * @generated
-	 */
-	public static final int XML_RETURN_INSERT_21 = 19;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 <em>Xml Transformation 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlTransformation_2_1()
-	 * @generated
-	 */
-	public static final int XML_TRANSFORMATION_21 = 20;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 <em>Xml Version 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlVersion_2_1()
-	 * @generated
-	 */
-	public static final int XML_VERSION_21 = 21;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1()
-	 * @generated
-	 */
-	public static final int XML_PRIMARY_KEY_21 = 18;
-
-	/**
-	 * The feature id for the '<em><b>Cache Key Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_21__CACHE_KEY_TYPE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Primary Key 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PRIMARY_KEY_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Return Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RETURN_INSERT_21__RETURN_ONLY = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Return Insert 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RETURN_INSERT_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION_21__ATTRIBUTE_TYPE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Transformation 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TRANSFORMATION_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION_21__ATTRIBUTE_TYPE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Version 21</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION_21_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1 <em>Cache Key Type 21</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getCacheKeyType_2_1()
-	 * @generated
-	 */
-	public static final int CACHE_KEY_TYPE_21 = 22;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 <em>Batch Fetch Type 21</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getBatchFetchType_2_1()
-	 * @generated
-	 */
-	public static final int BATCH_FETCH_TYPE_21 = 23;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasic_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBatchFetch_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlElementCollection_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddable_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbedded_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddedId_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntity_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityMappings_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlFetchAttribute_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlFetchGroup_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlFetchGroupContainer_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlId_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToMany_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToOne_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclass_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToMany_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToOne_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPersistenceUnitDefaults_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlReturnInsert_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTransformation_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVersion_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPrimaryKey_2_1EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum cacheKeyType_2_1EEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum batchFetchType_2_1EEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EclipseLinkOrmV2_1Package()
-	{
-		super(eNS_URI, EclipseLinkOrmV2_1Factory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link EclipseLinkOrmV2_1Package#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_1Package init()
-	{
-		if (isInited) return (EclipseLinkOrmV2_1Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI);
-
-		// Obtain or create and register package
-		EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV2_1Package());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
-		EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
-		EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
-		EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) : EclipseLinkOrmV2_2Package.eINSTANCE);
-		EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) : EclipseLinkOrmV2_3Package.eINSTANCE);
-		EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) : EclipseLinkOrmV2_4Package.eINSTANCE);
-
-		// Create package meta-data objects
-		theEclipseLinkOrmV2_1Package.createPackageContents();
-		theEclipseLinkOrmPackage.createPackageContents();
-		theEclipseLinkOrmV1_1Package.createPackageContents();
-		theEclipseLinkOrmV2_0Package.createPackageContents();
-		theEclipseLinkOrmV2_2Package.createPackageContents();
-		theEclipseLinkOrmV2_3Package.createPackageContents();
-		theEclipseLinkOrmV2_4Package.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLinkOrmV2_1Package.initializePackageContents();
-		theEclipseLinkOrmPackage.initializePackageContents();
-		theEclipseLinkOrmV1_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_0Package.initializePackageContents();
-		theEclipseLinkOrmV2_2Package.initializePackageContents();
-		theEclipseLinkOrmV2_3Package.initializePackageContents();
-		theEclipseLinkOrmV2_4Package.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLinkOrmV2_1Package.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(EclipseLinkOrmV2_1Package.eNS_URI, theEclipseLinkOrmV2_1Package);
-		return theEclipseLinkOrmV2_1Package;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1 <em>Xml Basic 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1
-	 * @generated
-	 */
-	public EClass getXmlBasic_2_1()
-	{
-		return xmlBasic_2_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert <em>Return Insert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Return Insert</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert()
-	 * @see #getXmlBasic_2_1()
-	 * @generated
-	 */
-	public EReference getXmlBasic_2_1_ReturnInsert()
-	{
-		return (EReference)xmlBasic_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate <em>Return Update</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Return Update</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate()
-	 * @see #getXmlBasic_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlBasic_2_1_ReturnUpdate()
-	{
-		return (EAttribute)xmlBasic_2_1EClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getAttributeType()
-	 * @see #getXmlBasic_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlBasic_2_1_AttributeType()
-	{
-		return (EAttribute)xmlBasic_2_1EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 <em>Xml Batch Fetch 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Batch Fetch 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1
-	 * @generated
-	 */
-	public EClass getXmlBatchFetch_2_1()
-	{
-		return xmlBatchFetch_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getSize <em>Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Size</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getSize()
-	 * @see #getXmlBatchFetch_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlBatchFetch_2_1_Size()
-	{
-		return (EAttribute)xmlBatchFetch_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getBatchFetchType <em>Batch Fetch Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Batch Fetch Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getBatchFetchType()
-	 * @see #getXmlBatchFetch_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlBatchFetch_2_1_BatchFetchType()
-	{
-		return (EAttribute)xmlBatchFetch_2_1EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 <em>Xml Element Collection 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Element Collection 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1
-	 * @generated
-	 */
-	public EClass getXmlElementCollection_2_1()
-	{
-		return xmlElementCollection_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1#getAttributeType()
-	 * @see #getXmlElementCollection_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlElementCollection_2_1_AttributeType()
-	{
-		return (EAttribute)xmlElementCollection_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 <em>Xml Embeddable 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embeddable 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1
-	 * @generated
-	 */
-	public EClass getXmlEmbeddable_2_1()
-	{
-		return xmlEmbeddable_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 <em>Xml Embedded 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embedded 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1
-	 * @generated
-	 */
-	public EClass getXmlEmbedded_2_1()
-	{
-		return xmlEmbedded_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1#getAttributeType()
-	 * @see #getXmlEmbedded_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlEmbedded_2_1_AttributeType()
-	{
-		return (EAttribute)xmlEmbedded_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 <em>Xml Embedded Id 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embedded Id 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1
-	 * @generated
-	 */
-	public EClass getXmlEmbeddedId_2_1()
-	{
-		return xmlEmbeddedId_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1#getAttributeType()
-	 * @see #getXmlEmbeddedId_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlEmbeddedId_2_1_AttributeType()
-	{
-		return (EAttribute)xmlEmbeddedId_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1
-	 * @generated
-	 */
-	public EClass getXmlEntity_2_1()
-	{
-		return xmlEntity_2_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor <em>Class Extractor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Class Extractor</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor()
-	 * @see #getXmlEntity_2_1()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_1_ClassExtractor()
-	{
-		return (EReference)xmlEntity_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getParentClass <em>Parent Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parent Class</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getParentClass()
-	 * @see #getXmlEntity_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlEntity_2_1_ParentClass()
-	{
-		return (EAttribute)xmlEntity_2_1EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity Mappings 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1
-	 * @generated
-	 */
-	public EClass getXmlEntityMappings_2_1()
-	{
-		return xmlEntityMappings_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Fetch Attribute 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1
-	 * @generated
-	 */
-	public EClass getXmlFetchAttribute_2_1()
-	{
-		return xmlFetchAttribute_2_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1#getName()
-	 * @see #getXmlFetchAttribute_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlFetchAttribute_2_1_Name()
-	{
-		return (EAttribute)xmlFetchAttribute_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1 <em>Xml Fetch Group 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Fetch Group 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1
-	 * @generated
-	 */
-	public EClass getXmlFetchGroup_2_1()
-	{
-		return xmlFetchGroup_2_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName()
-	 * @see #getXmlFetchGroup_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlFetchGroup_2_1_Name()
-	{
-		return (EAttribute)xmlFetchGroup_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getAttributes <em>Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Attributes</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getAttributes()
-	 * @see #getXmlFetchGroup_2_1()
-	 * @generated
-	 */
-	public EReference getXmlFetchGroup_2_1_Attributes()
-	{
-		return (EReference)xmlFetchGroup_2_1EClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getLoad <em>Load</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Load</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getLoad()
-	 * @see #getXmlFetchGroup_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlFetchGroup_2_1_Load()
-	{
-		return (EAttribute)xmlFetchGroup_2_1EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Fetch Group Container 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1
-	 * @generated
-	 */
-	public EClass getXmlFetchGroupContainer_2_1()
-	{
-		return xmlFetchGroupContainer_2_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1#getFetchGroups <em>Fetch Groups</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Fetch Groups</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1#getFetchGroups()
-	 * @see #getXmlFetchGroupContainer_2_1()
-	 * @generated
-	 */
-	public EReference getXmlFetchGroupContainer_2_1_FetchGroups()
-	{
-		return (EReference)xmlFetchGroupContainer_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1 <em>Xml Id 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Id 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1
-	 * @generated
-	 */
-	public EClass getXmlId_2_1()
-	{
-		return xmlId_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1#getAttributeType()
-	 * @see #getXmlId_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlId_2_1_AttributeType()
-	{
-		return (EAttribute)xmlId_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 <em>Xml Many To Many 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To Many 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1
-	 * @generated
-	 */
-	public EClass getXmlManyToMany_2_1()
-	{
-		return xmlManyToMany_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1#getAttributeType()
-	 * @see #getXmlManyToMany_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlManyToMany_2_1_AttributeType()
-	{
-		return (EAttribute)xmlManyToMany_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 <em>Xml Many To One 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To One 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1
-	 * @generated
-	 */
-	public EClass getXmlManyToOne_2_1()
-	{
-		return xmlManyToOne_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mapped Superclass 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass_2_1()
-	{
-		return xmlMappedSuperclass_2_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Sql Result Set Mappings</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getSqlResultSetMappings()
-	 * @see #getXmlMappedSuperclass_2_1()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_1_SqlResultSetMappings()
-	{
-		return (EReference)xmlMappedSuperclass_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors <em>Query Redirectors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Query Redirectors</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors()
-	 * @see #getXmlMappedSuperclass_2_1()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_1_QueryRedirectors()
-	{
-		return (EReference)xmlMappedSuperclass_2_1EClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getParentClass <em>Parent Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parent Class</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getParentClass()
-	 * @see #getXmlMappedSuperclass_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlMappedSuperclass_2_1_ParentClass()
-	{
-		return (EAttribute)xmlMappedSuperclass_2_1EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To Many 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1
-	 * @generated
-	 */
-	public EClass getXmlOneToMany_2_1()
-	{
-		return xmlOneToMany_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1#getAttributeType()
-	 * @see #getXmlOneToMany_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlOneToMany_2_1_AttributeType()
-	{
-		return (EAttribute)xmlOneToMany_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 <em>Xml One To One 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To One 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1
-	 * @generated
-	 */
-	public EClass getXmlOneToOne_2_1()
-	{
-		return xmlOneToOne_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 <em>Xml Persistence Unit Defaults 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Persistence Unit Defaults 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1
-	 * @generated
-	 */
-	public EClass getXmlPersistenceUnitDefaults_2_1()
-	{
-		return xmlPersistenceUnitDefaults_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Return Insert 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1
-	 * @generated
-	 */
-	public EClass getXmlReturnInsert_2_1()
-	{
-		return xmlReturnInsert_2_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1#getReturnOnly <em>Return Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Return Only</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1#getReturnOnly()
-	 * @see #getXmlReturnInsert_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlReturnInsert_2_1_ReturnOnly()
-	{
-		return (EAttribute)xmlReturnInsert_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 <em>Xml Transformation 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Transformation 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1
-	 * @generated
-	 */
-	public EClass getXmlTransformation_2_1()
-	{
-		return xmlTransformation_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1#getAttributeType()
-	 * @see #getXmlTransformation_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlTransformation_2_1_AttributeType()
-	{
-		return (EAttribute)xmlTransformation_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 <em>Xml Version 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Version 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1
-	 * @generated
-	 */
-	public EClass getXmlVersion_2_1()
-	{
-		return xmlVersion_2_1EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1#getAttributeType <em>Attribute Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1#getAttributeType()
-	 * @see #getXmlVersion_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlVersion_2_1_AttributeType()
-	{
-		return (EAttribute)xmlVersion_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Primary Key 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1
-	 * @generated
-	 */
-	public EClass getXmlPrimaryKey_2_1()
-	{
-		return xmlPrimaryKey_2_1EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1#getCacheKeyType <em>Cache Key Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cache Key Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1#getCacheKeyType()
-	 * @see #getXmlPrimaryKey_2_1()
-	 * @generated
-	 */
-	public EAttribute getXmlPrimaryKey_2_1_CacheKeyType()
-	{
-		return (EAttribute)xmlPrimaryKey_2_1EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1 <em>Cache Key Type 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Cache Key Type 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
-	 * @generated
-	 */
-	public EEnum getCacheKeyType_2_1()
-	{
-		return cacheKeyType_2_1EEnum;
-	}
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 <em>Batch Fetch Type 21</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Batch Fetch Type 21</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1
-	 * @generated
-	 */
-	public EEnum getBatchFetchType_2_1()
-	{
-		return batchFetchType_2_1EEnum;
-	}
-
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_1Factory getEclipseLinkOrmV2_1Factory()
-	{
-		return (EclipseLinkOrmV2_1Factory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents()
-	{
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		xmlBasic_2_1EClass = createEClass(XML_BASIC_21);
-		createEReference(xmlBasic_2_1EClass, XML_BASIC_21__RETURN_INSERT);
-		createEAttribute(xmlBasic_2_1EClass, XML_BASIC_21__RETURN_UPDATE);
-		createEAttribute(xmlBasic_2_1EClass, XML_BASIC_21__ATTRIBUTE_TYPE);
-
-		xmlBatchFetch_2_1EClass = createEClass(XML_BATCH_FETCH_21);
-		createEAttribute(xmlBatchFetch_2_1EClass, XML_BATCH_FETCH_21__SIZE);
-		createEAttribute(xmlBatchFetch_2_1EClass, XML_BATCH_FETCH_21__BATCH_FETCH_TYPE);
-
-		xmlElementCollection_2_1EClass = createEClass(XML_ELEMENT_COLLECTION_21);
-		createEAttribute(xmlElementCollection_2_1EClass, XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE);
-
-		xmlEmbeddable_2_1EClass = createEClass(XML_EMBEDDABLE_21);
-
-		xmlEmbedded_2_1EClass = createEClass(XML_EMBEDDED_21);
-		createEAttribute(xmlEmbedded_2_1EClass, XML_EMBEDDED_21__ATTRIBUTE_TYPE);
-
-		xmlEmbeddedId_2_1EClass = createEClass(XML_EMBEDDED_ID_21);
-		createEAttribute(xmlEmbeddedId_2_1EClass, XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE);
-
-		xmlEntity_2_1EClass = createEClass(XML_ENTITY_21);
-		createEReference(xmlEntity_2_1EClass, XML_ENTITY_21__CLASS_EXTRACTOR);
-		createEAttribute(xmlEntity_2_1EClass, XML_ENTITY_21__PARENT_CLASS);
-
-		xmlEntityMappings_2_1EClass = createEClass(XML_ENTITY_MAPPINGS_21);
-
-		xmlFetchAttribute_2_1EClass = createEClass(XML_FETCH_ATTRIBUTE_21);
-		createEAttribute(xmlFetchAttribute_2_1EClass, XML_FETCH_ATTRIBUTE_21__NAME);
-
-		xmlFetchGroup_2_1EClass = createEClass(XML_FETCH_GROUP_21);
-		createEAttribute(xmlFetchGroup_2_1EClass, XML_FETCH_GROUP_21__NAME);
-		createEAttribute(xmlFetchGroup_2_1EClass, XML_FETCH_GROUP_21__LOAD);
-		createEReference(xmlFetchGroup_2_1EClass, XML_FETCH_GROUP_21__ATTRIBUTES);
-
-		xmlFetchGroupContainer_2_1EClass = createEClass(XML_FETCH_GROUP_CONTAINER_21);
-		createEReference(xmlFetchGroupContainer_2_1EClass, XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS);
-
-		xmlId_2_1EClass = createEClass(XML_ID_21);
-		createEAttribute(xmlId_2_1EClass, XML_ID_21__ATTRIBUTE_TYPE);
-
-		xmlManyToMany_2_1EClass = createEClass(XML_MANY_TO_MANY_21);
-		createEAttribute(xmlManyToMany_2_1EClass, XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE);
-
-		xmlManyToOne_2_1EClass = createEClass(XML_MANY_TO_ONE_21);
-
-		xmlMappedSuperclass_2_1EClass = createEClass(XML_MAPPED_SUPERCLASS_21);
-		createEReference(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS);
-		createEReference(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS);
-		createEAttribute(xmlMappedSuperclass_2_1EClass, XML_MAPPED_SUPERCLASS_21__PARENT_CLASS);
-
-		xmlOneToMany_2_1EClass = createEClass(XML_ONE_TO_MANY_21);
-		createEAttribute(xmlOneToMany_2_1EClass, XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE);
-
-		xmlOneToOne_2_1EClass = createEClass(XML_ONE_TO_ONE_21);
-
-		xmlPersistenceUnitDefaults_2_1EClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS_21);
-
-		xmlPrimaryKey_2_1EClass = createEClass(XML_PRIMARY_KEY_21);
-		createEAttribute(xmlPrimaryKey_2_1EClass, XML_PRIMARY_KEY_21__CACHE_KEY_TYPE);
-
-		xmlReturnInsert_2_1EClass = createEClass(XML_RETURN_INSERT_21);
-		createEAttribute(xmlReturnInsert_2_1EClass, XML_RETURN_INSERT_21__RETURN_ONLY);
-
-		xmlTransformation_2_1EClass = createEClass(XML_TRANSFORMATION_21);
-		createEAttribute(xmlTransformation_2_1EClass, XML_TRANSFORMATION_21__ATTRIBUTE_TYPE);
-
-		xmlVersion_2_1EClass = createEClass(XML_VERSION_21);
-		createEAttribute(xmlVersion_2_1EClass, XML_VERSION_21__ATTRIBUTE_TYPE);
-
-		// Create enums
-		cacheKeyType_2_1EEnum = createEEnum(CACHE_KEY_TYPE_21);
-		batchFetchType_2_1EEnum = createEEnum(BATCH_FETCH_TYPE_21);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents()
-	{
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-		OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		xmlElementCollection_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlJoinFetch());
-		xmlElementCollection_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder());
-		xmlEmbeddable_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder());
-		xmlEntity_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder());
-		xmlEntity_2_1EClass.getESuperTypes().add(this.getXmlFetchGroupContainer_2_1());
-		xmlEntityMappings_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder());
-		xmlManyToMany_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder());
-		xmlManyToOne_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder());
-		xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer());
-		xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlAttributeOverrideContainer());
-		xmlMappedSuperclass_2_1EClass.getESuperTypes().add(this.getXmlFetchGroupContainer_2_1());
-		xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlGeneratorContainer());
-		xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theOrmPackage.getXmlQueryContainer());
-		xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlQueryContainer());
-		xmlMappedSuperclass_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder());
-		xmlOneToMany_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder());
-		xmlOneToOne_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlBatchFetchHolder());
-		xmlPersistenceUnitDefaults_2_1EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlAccessMethodsHolder());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlBasic_2_1EClass, XmlBasic_2_1.class, "XmlBasic_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBasic_2_1_ReturnInsert(), theEclipseLinkOrmPackage.getXmlReturnInsert(), null, "returnInsert", null, 0, 1, XmlBasic_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBasic_2_1_ReturnUpdate(), theXMLTypePackage.getBooleanObject(), "returnUpdate", null, 0, 1, XmlBasic_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBasic_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlBasic_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBatchFetch_2_1EClass, XmlBatchFetch_2_1.class, "XmlBatchFetch_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlBatchFetch_2_1_Size(), theXMLTypePackage.getIntObject(), "size", null, 0, 1, XmlBatchFetch_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlBatchFetch_2_1_BatchFetchType(), this.getBatchFetchType_2_1(), "batchFetchType", null, 0, 1, XmlBatchFetch_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlElementCollection_2_1EClass, XmlElementCollection_2_1.class, "XmlElementCollection_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlElementCollection_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlElementCollection_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEmbeddable_2_1EClass, XmlEmbeddable_2_1.class, "XmlEmbeddable_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlEmbedded_2_1EClass, XmlEmbedded_2_1.class, "XmlEmbedded_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlEmbedded_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlEmbedded_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEmbeddedId_2_1EClass, XmlEmbeddedId_2_1.class, "XmlEmbeddedId_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlEmbeddedId_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlEmbeddedId_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntity_2_1EClass, XmlEntity_2_1.class, "XmlEntity_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntity_2_1_ClassExtractor(), theOrmPackage.getXmlClassReference(), null, "classExtractor", null, 0, 1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntity_2_1_ParentClass(), theXMLTypePackage.getString(), "parentClass", null, 0, 1, XmlEntity_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntityMappings_2_1EClass, XmlEntityMappings_2_1.class, "XmlEntityMappings_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlFetchAttribute_2_1EClass, XmlFetchAttribute_2_1.class, "XmlFetchAttribute_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlFetchAttribute_2_1_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlFetchAttribute_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlFetchGroup_2_1EClass, XmlFetchGroup_2_1.class, "XmlFetchGroup_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlFetchGroup_2_1_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlFetchGroup_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlFetchGroup_2_1_Load(), theXMLTypePackage.getBooleanObject(), "load", null, 0, 1, XmlFetchGroup_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlFetchGroup_2_1_Attributes(), theEclipseLinkOrmPackage.getXmlFetchAttribute(), null, "attributes", null, 0, -1, XmlFetchGroup_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlFetchGroupContainer_2_1EClass, XmlFetchGroupContainer_2_1.class, "XmlFetchGroupContainer_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlFetchGroupContainer_2_1_FetchGroups(), theEclipseLinkOrmPackage.getXmlFetchGroup(), null, "fetchGroups", null, 0, -1, XmlFetchGroupContainer_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlId_2_1EClass, XmlId_2_1.class, "XmlId_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlId_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlId_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlManyToMany_2_1EClass, XmlManyToMany_2_1.class, "XmlManyToMany_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlManyToMany_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlManyToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlManyToOne_2_1EClass, XmlManyToOne_2_1.class, "XmlManyToOne_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlMappedSuperclass_2_1EClass, XmlMappedSuperclass_2_1.class, "XmlMappedSuperclass_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMappedSuperclass_2_1_SqlResultSetMappings(), theOrmPackage.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_2_1_QueryRedirectors(), theEclipseLinkOrmPackage.getXmlQueryRedirectors(), null, "queryRedirectors", null, 0, 1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlMappedSuperclass_2_1_ParentClass(), theXMLTypePackage.getString(), "parentClass", null, 0, 1, XmlMappedSuperclass_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToMany_2_1EClass, XmlOneToMany_2_1.class, "XmlOneToMany_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlOneToMany_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlOneToMany_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToOne_2_1EClass, XmlOneToOne_2_1.class, "XmlOneToOne_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPersistenceUnitDefaults_2_1EClass, XmlPersistenceUnitDefaults_2_1.class, "XmlPersistenceUnitDefaults_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlPrimaryKey_2_1EClass, XmlPrimaryKey_2_1.class, "XmlPrimaryKey_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPrimaryKey_2_1_CacheKeyType(), this.getCacheKeyType_2_1(), "cacheKeyType", null, 0, 1, XmlPrimaryKey_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlReturnInsert_2_1EClass, XmlReturnInsert_2_1.class, "XmlReturnInsert_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlReturnInsert_2_1_ReturnOnly(), theXMLTypePackage.getBooleanObject(), "returnOnly", null, 0, 1, XmlReturnInsert_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTransformation_2_1EClass, XmlTransformation_2_1.class, "XmlTransformation_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTransformation_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlTransformation_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlVersion_2_1EClass, XmlVersion_2_1.class, "XmlVersion_2_1", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlVersion_2_1_AttributeType(), theXMLTypePackage.getString(), "attributeType", null, 0, 1, XmlVersion_2_1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(cacheKeyType_2_1EEnum, CacheKeyType_2_1.class, "CacheKeyType_2_1");
-		addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.ID_VALUE);
-		addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.CACHE_KEY);
-		addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.AUTO);
-
-		initEEnum(batchFetchType_2_1EEnum, BatchFetchType_2_1.class, "BatchFetchType_2_1");
-		addEEnumLiteral(batchFetchType_2_1EEnum, BatchFetchType_2_1.JOIN);
-		addEEnumLiteral(batchFetchType_2_1EEnum, BatchFetchType_2_1.EXISTS);
-		addEEnumLiteral(batchFetchType_2_1EEnum, BatchFetchType_2_1.IN);
-	}
-
-	/**
-	 * <!-- 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.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1 <em>Xml Basic 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_21 = eINSTANCE.getXmlBasic_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Return Insert</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_BASIC_21__RETURN_INSERT = eINSTANCE.getXmlBasic_2_1_ReturnInsert();
-
-		/**
-		 * The meta object literal for the '<em><b>Return Update</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC_21__RETURN_UPDATE = eINSTANCE.getXmlBasic_2_1_ReturnUpdate();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlBasic_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1 <em>Xml Batch Fetch 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_BATCH_FETCH_21 = eINSTANCE.getXmlBatchFetch_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Size</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BATCH_FETCH_21__SIZE = eINSTANCE.getXmlBatchFetch_2_1_Size();
-
-		/**
-		 * The meta object literal for the '<em><b>Batch Fetch Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BATCH_FETCH_21__BATCH_FETCH_TYPE = eINSTANCE.getXmlBatchFetch_2_1_BatchFetchType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1 <em>Xml Element Collection 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlElementCollection_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_ELEMENT_COLLECTION_21 = eINSTANCE.getXmlElementCollection_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ELEMENT_COLLECTION_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlElementCollection_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1 <em>Xml Embeddable 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddable_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddable_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDABLE_21 = eINSTANCE.getXmlEmbeddable_2_1();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1 <em>Xml Embedded 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbedded_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_21 = eINSTANCE.getXmlEmbedded_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_EMBEDDED_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlEmbedded_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1 <em>Xml Embedded Id 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddedId_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDED_ID_21 = eINSTANCE.getXmlEmbeddedId_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_EMBEDDED_ID_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlEmbeddedId_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1 <em>Xml Entity 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_21 = eINSTANCE.getXmlEntity_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Class Extractor</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_21__CLASS_EXTRACTOR = eINSTANCE.getXmlEntity_2_1_ClassExtractor();
-
-		/**
-		 * The meta object literal for the '<em><b>Parent Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY_21__PARENT_CLASS = eINSTANCE.getXmlEntity_2_1_ParentClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1 <em>Xml Entity Mappings 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntityMappings_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntityMappings_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_MAPPINGS_21 = eINSTANCE.getXmlEntityMappings_2_1();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1 <em>Xml Fetch Attribute 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_FETCH_ATTRIBUTE_21 = eINSTANCE.getXmlFetchAttribute_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_FETCH_ATTRIBUTE_21__NAME = eINSTANCE.getXmlFetchAttribute_2_1_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1 <em>Xml Fetch Group 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_FETCH_GROUP_21 = eINSTANCE.getXmlFetchGroup_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_FETCH_GROUP_21__NAME = eINSTANCE.getXmlFetchGroup_2_1_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_FETCH_GROUP_21__ATTRIBUTES = eINSTANCE.getXmlFetchGroup_2_1_Attributes();
-
-		/**
-		 * The meta object literal for the '<em><b>Load</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_FETCH_GROUP_21__LOAD = eINSTANCE.getXmlFetchGroup_2_1_Load();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1 <em>Xml Fetch Group Container 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_FETCH_GROUP_CONTAINER_21 = eINSTANCE.getXmlFetchGroupContainer_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Fetch Groups</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_FETCH_GROUP_CONTAINER_21__FETCH_GROUPS = eINSTANCE.getXmlFetchGroupContainer_2_1_FetchGroups();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1 <em>Xml Id 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlId_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_ID_21 = eINSTANCE.getXmlId_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ID_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlId_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1 <em>Xml Many To Many 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToMany_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY_21 = eINSTANCE.getXmlManyToMany_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MANY_TO_MANY_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlManyToMany_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1 <em>Xml Many To One 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToOne_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToOne_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE_21 = eINSTANCE.getXmlManyToOne_2_1();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1 <em>Xml Mapped Superclass 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPED_SUPERCLASS_21 = eINSTANCE.getXmlMappedSuperclass_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Sql Result Set Mappings</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_21__SQL_RESULT_SET_MAPPINGS = eINSTANCE.getXmlMappedSuperclass_2_1_SqlResultSetMappings();
-
-		/**
-		 * The meta object literal for the '<em><b>Query Redirectors</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_21__QUERY_REDIRECTORS = eINSTANCE.getXmlMappedSuperclass_2_1_QueryRedirectors();
-
-		/**
-		 * The meta object literal for the '<em><b>Parent Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MAPPED_SUPERCLASS_21__PARENT_CLASS = eINSTANCE.getXmlMappedSuperclass_2_1_ParentClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1 <em>Xml One To Many 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToMany_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY_21 = eINSTANCE.getXmlOneToMany_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ONE_TO_MANY_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlOneToMany_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1 <em>Xml One To One 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToOne_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToOne_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE_21 = eINSTANCE.getXmlOneToOne_2_1();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1 <em>Xml Persistence Unit Defaults 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPersistenceUnitDefaults_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPersistenceUnitDefaults_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS_21 = eINSTANCE.getXmlPersistenceUnitDefaults_2_1();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1 <em>Xml Return Insert 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_RETURN_INSERT_21 = eINSTANCE.getXmlReturnInsert_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Return Only</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_RETURN_INSERT_21__RETURN_ONLY = eINSTANCE.getXmlReturnInsert_2_1_ReturnOnly();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1 <em>Xml Transformation 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlTransformation_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_TRANSFORMATION_21 = eINSTANCE.getXmlTransformation_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TRANSFORMATION_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlTransformation_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1 <em>Xml Version 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlVersion_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION_21 = eINSTANCE.getXmlVersion_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Attribute Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_VERSION_21__ATTRIBUTE_TYPE = eINSTANCE.getXmlVersion_2_1_AttributeType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1 <em>Xml Primary Key 21</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1()
-		 * @generated
-		 */
-		public static final EClass XML_PRIMARY_KEY_21 = eINSTANCE.getXmlPrimaryKey_2_1();
-
-		/**
-		 * The meta object literal for the '<em><b>Cache Key Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PRIMARY_KEY_21__CACHE_KEY_TYPE = eINSTANCE.getXmlPrimaryKey_2_1_CacheKeyType();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1 <em>Cache Key Type 21</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getCacheKeyType_2_1()
-		 * @generated
-		 */
-		public static final EEnum CACHE_KEY_TYPE_21 = eINSTANCE.getCacheKeyType_2_1();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1 <em>Batch Fetch Type 21</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getBatchFetchType_2_1()
-		 * @generated
-		 */
-		public static final EEnum BATCH_FETCH_TYPE_21 = eINSTANCE.getBatchFetchType_2_1();
-
-	}
-
-} //EclipseLinkOrmV2_1Package
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
deleted file mode 100644
index b0e26ec5b8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBasic_2_1.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlReturnInsert;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert <em>Return Insert</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate <em>Return Update</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlBasic_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Return Insert</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Insert</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Insert</em>' containment reference.
-	 * @see #setReturnInsert(XmlReturnInsert)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1_ReturnInsert()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlReturnInsert getReturnInsert();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnInsert <em>Return Insert</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Insert</em>' containment reference.
-	 * @see #getReturnInsert()
-	 * @generated
-	 */
-	void setReturnInsert(XmlReturnInsert value);
-
-	/**
-	 * Returns the value of the '<em><b>Return Update</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Update</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Update</em>' attribute.
-	 * @see #setReturnUpdate(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1_ReturnUpdate()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getReturnUpdate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getReturnUpdate <em>Return Update</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Update</em>' attribute.
-	 * @see #getReturnUpdate()
-	 * @generated
-	 */
-	void setReturnUpdate(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBasic_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBasic_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlBasic_2_1
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
deleted file mode 100644
index 24e9b3379c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlBatchFetch_2_1.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Batch Fetch 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- *  * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getSize <em>Size</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getBatchFetchType <em>Batch Fetch Type</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlBatchFetch_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Size</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Size</em>' attribute.
-	 * @see #setSize(Integer)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1_Size()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject"
-	 * @generated
-	 */
-	Integer getSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getSize <em>Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Size</em>' attribute.
-	 * @see #getSize()
-	 * @generated
-	 */
-	void setSize(Integer value);
-
-	/**
-	 * Returns the value of the '<em><b>Batch Fetch Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Batch Fetch 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>Batch Fetch Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1
-	 * @see #setBatchFetchType(BatchFetchType_2_1)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlBatchFetch_2_1_BatchFetchType()
-	 * @model
-	 * @generated
-	 */
-	BatchFetchType_2_1 getBatchFetchType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlBatchFetch_2_1#getBatchFetchType <em>Batch Fetch Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Batch Fetch Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.BatchFetchType_2_1
-	 * @see #getBatchFetchType()
-	 * @generated
-	 */
-	void setBatchFetchType(BatchFetchType_2_1 value);
-
-} // XmlBatchFetch_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlElementCollection_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlElementCollection_2_1.java
deleted file mode 100644
index 9d1222403d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlElementCollection_2_1.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlJoinFetch;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Element Collection 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- *  * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlElementCollection_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlElementCollection_2_1 extends XmlJoinFetch, XmlBatchFetchHolder
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlElementCollection_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlElementCollection_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlElementCollection_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbeddable_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbeddable_2_1.java
deleted file mode 100644
index 0236db9340..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbeddable_2_1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embeddable 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddable_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEmbeddable_2_1 extends XmlAccessMethodsHolder
-{
-} // XmlEmbeddable_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbeddedId_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbeddedId_2_1.java
deleted file mode 100644
index 250ea5b7b9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbeddedId_2_1.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded Id 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddedId_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlEmbeddedId_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbeddedId_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbeddedId_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlEmbeddedId_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbedded_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbedded_2_1.java
deleted file mode 100644
index 13315805b6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEmbedded_2_1.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embedded 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbedded_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlEmbedded_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEmbedded_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEmbedded_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlEmbedded_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEntityMappings_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEntityMappings_2_1.java
deleted file mode 100644
index 50d417e5e6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEntityMappings_2_1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity Mappings 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntityMappings_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEntityMappings_2_1 extends XmlAccessMethodsHolder
-{
-} // XmlEntityMappings_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java
deleted file mode 100644
index 4fb916b515..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlEntity_2_1.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.orm.XmlClassReference;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor <em>Class Extractor</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getParentClass <em>Parent Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEntity_2_1 extends XmlAccessMethodsHolder, XmlFetchGroupContainer_2_1
-{
-	/**
-	 * Returns the value of the '<em><b>Class Extractor</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Class Extractor</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Class Extractor</em>' containment reference.
-	 * @see #setClassExtractor(XmlClassReference)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1_ClassExtractor()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlClassReference getClassExtractor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getClassExtractor <em>Class Extractor</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Class Extractor</em>' containment reference.
-	 * @see #getClassExtractor()
-	 * @generated
-	 */
-	void setClassExtractor(XmlClassReference value);
-
-	/**
-	 * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent 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>Parent Class</em>' attribute.
-	 * @see #setParentClass(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlEntity_2_1_ParentClass()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getParentClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlEntity_2_1#getParentClass <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Class</em>' attribute.
-	 * @see #getParentClass()
-	 * @generated
-	 */
-	void setParentClass(String value);
-
-} // XmlEntity_2_1
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
deleted file mode 100644
index 82ccb4cde7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchAttribute_2_1.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Fetch Attribute 21</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlFetchAttribute_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchAttribute_2_1_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchAttribute_2_1#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlFetchAttribute_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.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
deleted file mode 100644
index b3e8bf93cb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroupContainer_2_1.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.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.jpa.eclipselink.core.resource.orm.XmlFetchGroup;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Fetch Group Container 21</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroupContainer_2_1#getFetchGroups <em>Fetch Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlFetchGroupContainer_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Fetch Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchGroup}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fetch Groups</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fetch Groups</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroupContainer_2_1_FetchGroups()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlFetchGroup> getFetchGroups();
-
-} // XmlFetchGroupContainer_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.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
deleted file mode 100644
index ce3e4dc0b1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlFetchGroup_2_1.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.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.jpa.eclipselink.core.resource.orm.XmlFetchAttribute;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Fetch Group 21</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getLoad <em>Load</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlFetchGroup_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Attributes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlFetchAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attributes</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1_Attributes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlFetchAttribute> getAttributes();
-
-	/**
-	 * Returns the value of the '<em><b>Load</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Load</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Load</em>' attribute.
-	 * @see #setLoad(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlFetchGroup_2_1_Load()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getLoad();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlFetchGroup_2_1#getLoad <em>Load</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Load</em>' attribute.
-	 * @see #getLoad()
-	 * @generated
-	 */
-	void setLoad(Boolean value);
-
-} // XmlFetchGroup_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlId_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlId_2_1.java
deleted file mode 100644
index ef3ed3c1f6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlId_2_1.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Id 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlId_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlId_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlId_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlId_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlId_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlManyToMany_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlManyToMany_2_1.java
deleted file mode 100644
index 7caefb6b7d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlManyToMany_2_1.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To Many 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToMany_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToMany_2_1 extends XmlBatchFetchHolder
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToMany_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlManyToMany_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlManyToMany_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlManyToOne_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlManyToOne_2_1.java
deleted file mode 100644
index 38619f5aa9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlManyToOne_2_1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To One 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlManyToOne_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToOne_2_1 extends XmlBatchFetchHolder
-{
-} // XmlManyToOne_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java
deleted file mode 100644
index eda794877b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlMappedSuperclass_2_1.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverrideContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverrideContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlGeneratorContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlQueryContainer;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryRedirectors;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Mapped Superclass 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors <em>Query Redirectors</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getParentClass <em>Parent Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlMappedSuperclass_2_1 extends XmlAssociationOverrideContainer, XmlAttributeOverrideContainer, XmlFetchGroupContainer_2_1, XmlGeneratorContainer, XmlQueryContainer, org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlQueryContainer, XmlAccessMethodsHolder
-{
-	/**
-	 * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.core.resource.orm.SqlResultSetMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sql Result Set Mappings</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1_SqlResultSetMappings()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<SqlResultSetMapping> getSqlResultSetMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Query Redirectors</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query Redirectors</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query Redirectors</em>' containment reference.
-	 * @see #setQueryRedirectors(XmlQueryRedirectors)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1_QueryRedirectors()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlQueryRedirectors getQueryRedirectors();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getQueryRedirectors <em>Query Redirectors</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query Redirectors</em>' containment reference.
-	 * @see #getQueryRedirectors()
-	 * @generated
-	 */
-	void setQueryRedirectors(XmlQueryRedirectors value);
-
-	/**
-	 * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent 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>Parent Class</em>' attribute.
-	 * @see #setParentClass(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlMappedSuperclass_2_1_ParentClass()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getParentClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlMappedSuperclass_2_1#getParentClass <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Class</em>' attribute.
-	 * @see #getParentClass()
-	 * @generated
-	 */
-	void setParentClass(String value);
-
-} // XmlMappedSuperclass_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlOneToMany_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlOneToMany_2_1.java
deleted file mode 100644
index 51b4e953e1..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlOneToMany_2_1.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To Many 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToMany_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToMany_2_1 extends XmlBatchFetchHolder
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToMany_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlOneToMany_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlOneToMany_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlOneToOne_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlOneToOne_2_1.java
deleted file mode 100644
index 38cc74ba5f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlOneToOne_2_1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBatchFetchHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To One 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlOneToOne_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToOne_2_1 extends XmlBatchFetchHolder
-{
-} // XmlOneToOne_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPersistenceUnitDefaults_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPersistenceUnitDefaults_2_1.java
deleted file mode 100644
index f7e8e87111..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPersistenceUnitDefaults_2_1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAccessMethodsHolder;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Persistence Unit Defaults 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPersistenceUnitDefaults_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlPersistenceUnitDefaults_2_1 extends XmlAccessMethodsHolder
-{
-} // XmlPersistenceUnitDefaults_2_1
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
deleted file mode 100644
index 0127f3b912..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlPrimaryKey_2_1.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Primary Key 21</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1#getCacheKeyType <em>Cache Key Type</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlPrimaryKey_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cache Key Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Key Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cache Key Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
-	 * @see #setCacheKeyType(CacheKeyType_2_1)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlPrimaryKey_2_1_CacheKeyType()
-	 * @model
-	 * @generated
-	 */
-	CacheKeyType_2_1 getCacheKeyType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlPrimaryKey_2_1#getCacheKeyType <em>Cache Key Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Key Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.CacheKeyType_2_1
-	 * @see #getCacheKeyType()
-	 * @generated
-	 */
-	void setCacheKeyType(CacheKeyType_2_1 value);
-
-} // XmlPrimaryKey_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.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
deleted file mode 100644
index f8fa5eb769..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlReturnInsert_2_1.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Return Insert 21</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1#getReturnOnly <em>Return Only</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlReturnInsert_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Return Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Only</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Only</em>' attribute.
-	 * @see #setReturnOnly(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlReturnInsert_2_1_ReturnOnly()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getReturnOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlReturnInsert_2_1#getReturnOnly <em>Return Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Only</em>' attribute.
-	 * @see #getReturnOnly()
-	 * @generated
-	 */
-	void setReturnOnly(Boolean value);
-
-} // XmlReturnInsert_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlTransformation_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlTransformation_2_1.java
deleted file mode 100644
index 43fdb09ee9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlTransformation_2_1.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Transformation 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlTransformation_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlTransformation_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlTransformation_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlTransformation_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlTransformation_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlVersion_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlVersion_2_1.java
deleted file mode 100644
index 2cd3528b93..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/XmlVersion_2_1.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Version 21</b></em>'.
- *  
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * 
- * @version 2.3
- * @since 2.3
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1#getAttributeType <em>Attribute Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlVersion_2_1()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlVersion_2_1 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Attribute Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute 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>Attribute Type</em>' attribute.
-	 * @see #setAttributeType(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLinkOrmV2_1Package#getXmlVersion_2_1_AttributeType()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getAttributeType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.XmlVersion_2_1#getAttributeType <em>Attribute Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute Type</em>' attribute.
-	 * @see #getAttributeType()
-	 * @generated
-	 */
-	void setAttributeType(String value);
-
-} // XmlVersion_2_1
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLink2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLink2_2.java
deleted file mode 100644
index 6c4b7bf5eb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLink2_2.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_1.EclipseLink2_1;
-
-@SuppressWarnings("nls")
-public interface EclipseLink2_2
-	extends EclipseLink2_1
-{
-	String SCHEMA_NAMESPACE = EclipseLink.SCHEMA_NAMESPACE;
-	String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_2.xsd";
-	String SCHEMA_VERSION	= "2.2";
-	
-	
-	// EclipseLink 2.2 specific nodes
-	String ADDITIONAL_CRITERIA = "additional-criteria";
-	String CASCADE_ON_DELETE = "cascade-on-delete";
-	String CRITERIA = "criteria";
-	String CREATION_SUFFIX = "creation-suffix";
-	String HASH_PARTITIONING = "hash-partitioning";
-	String INDEX = "index";
-		String INDEX__COLUMN_NAME = "column-name";
-		String INDEX__NAME = "name";
-		String INDEX__CATALOG = "catalog";
-		String INDEX__SCHEMA = "schema";
-		String INDEX__TABLE = "table";
-		String INDEX__UNIQUE = "unique";
-	String NONCACHEABLE = "noncacheable";
-	String PARENT_CLASS = "parent-class";
-	String PARTITIONING = "partitioning";
-	String PARTITIONING_GROUP__PARTITIONED = "partitioned";
-	String PINNED_PARTITIONING = "pinned-partitioning";
-	String RANGE_PARTITIONING = "range-partitioning";
-	String REPLICATION_PARTITIONING = "replication-partitioning";
-	String ROUND_ROBIN_PARTITIONING = "round-robin-partitioning";
-	String UNION_PARTITIONING = "union-partitioning";
-	String VALUE_PARTITIONING = "value-partitioning";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Factory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Factory.java
deleted file mode 100644
index d1c8b4d332..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Factory.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package
- * @generated
- */
-public class EclipseLinkOrmV2_2Factory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_2Factory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_2Factory init()
-	{
-		try
-		{
-			EclipseLinkOrmV2_2Factory theEclipseLinkOrmV2_2Factory = (EclipseLinkOrmV2_2Factory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.v2_2.xmi"); 
-			if (theEclipseLinkOrmV2_2Factory != null)
-			{
-				return theEclipseLinkOrmV2_2Factory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EclipseLinkOrmV2_2Factory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_2Factory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_2Package getEclipseLinkOrmV2_2Package()
-	{
-		return (EclipseLinkOrmV2_2Package)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EclipseLinkOrmV2_2Package getPackage()
-	{
-		return EclipseLinkOrmV2_2Package.eINSTANCE;
-	}
-
-} //EclipseLinkOrmV2_2Factory
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
deleted file mode 100644
index 18c23c6ffd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/EclipseLinkOrmV2_2Package.java
+++ /dev/null
@@ -1,4510 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-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_3.EclipseLinkOrmV2_3Package;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package;
-
-/**
- * <!-- 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>
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Factory
- * @model kind="package"
- * @generated
- */
-public class EclipseLinkOrmV2_2Package extends EPackageImpl
-{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNAME = "v2_2";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_URI = "jpt.eclipselink.orm.v2_2.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_2Package eINSTANCE = org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2 <em>Xml Additional Criteria 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlAdditionalCriteria_2_2()
-	 * @generated
-	 */
-	public static final int XML_ADDITIONAL_CRITERIA_22 = 0;
-
-	/**
-	 * The feature id for the '<em><b>Criteria</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ADDITIONAL_CRITERIA_22__CRITERIA = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Additional Criteria 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ADDITIONAL_CRITERIA_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2 <em>Xml Basic 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasic_2_2()
-	 * @generated
-	 */
-	public static final int XML_BASIC_22 = 1;
-
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_22__INDEX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2 <em>Xml Basic Collection 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicCollection_2_2()
-	 * @generated
-	 */
-	public static final int XML_BASIC_COLLECTION_22 = 2;
-
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION_22__CASCADE_ON_DELETE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic Collection 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_COLLECTION_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2 <em>Xml Basic Map 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicMap_2_2()
-	 * @generated
-	 */
-	public static final int XML_BASIC_MAP_22 = 3;
-
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP_22__CASCADE_ON_DELETE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic Map 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_MAP_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2 <em>Xml Collection Table 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlCollectionTable_2_2()
-	 * @generated
-	 */
-	public static final int XML_COLLECTION_TABLE_22 = 4;
-
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE_22__CREATION_SUFFIX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Collection Table 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_COLLECTION_TABLE_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2 <em>Xml Partitioning Group 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public static final int XML_PARTITIONING_GROUP_22 = 19;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__PARTITIONING = 0;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING = 1;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING = 2;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING = 3;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING = 4;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING = 5;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__HASH_PARTITIONING = 6;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__UNION_PARTITIONING = 7;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22__PARTITIONED = 8;
-
-	/**
-	 * The number of structural features of the '<em>Xml Partitioning Group 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_GROUP_22_FEATURE_COUNT = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2 <em>Xml Element Collection 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlElementCollection_2_2()
-	 * @generated
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22 = 5;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__PARTITIONING = XML_PARTITIONING_GROUP_22__PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__REPLICATION_PARTITIONING = XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__ROUND_ROBIN_PARTITIONING = XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__PINNED_PARTITIONING = XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__RANGE_PARTITIONING = XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__VALUE_PARTITIONING = XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__HASH_PARTITIONING = XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__UNION_PARTITIONING = XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__PARTITIONED = XML_PARTITIONING_GROUP_22__PARTITIONED;
-
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__CASCADE_ON_DELETE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Noncacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22__NONCACHEABLE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Element Collection 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_22_FEATURE_COUNT = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2 <em>Xml Entity 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntity_2_2()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_22 = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2 <em>Xml Entity Mappings 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22 = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2 <em>Xml Hash Partitioning 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlHashPartitioning_2_2()
-	 * @generated
-	 */
-	public static final int XML_HASH_PARTITIONING_22 = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2 <em>Xml Many To Many 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToMany_2_2()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_MANY_22 = 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2 <em>Xml Many To One 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToOne_2_2()
-	 * @generated
-	 */
-	public static final int XML_MANY_TO_ONE_22 = 14;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2 <em>Xml One To One 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToOne_2_2()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_ONE_22 = 16;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2 <em>Xml One To Many 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToMany_2_2()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY_22 = 17;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2 <em>Xml Partitioning 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioning_2_2()
-	 * @generated
-	 */
-	public static final int XML_PARTITIONING_22 = 18;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2 <em>Xml Pinned Partitioning 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPinnedPartitioning_2_2()
-	 * @generated
-	 */
-	public static final int XML_PINNED_PARTITIONING_22 = 20;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2 <em>Xml Range Partitioning 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRangePartitioning_2_2()
-	 * @generated
-	 */
-	public static final int XML_RANGE_PARTITIONING_22 = 21;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2 <em>Xml Replication Partitioning 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlReplicationPartitioning_2_2()
-	 * @generated
-	 */
-	public static final int XML_REPLICATION_PARTITIONING_22 = 22;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2 <em>Xml Round Robin Partitioning 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRoundRobinPartitioning_2_2()
-	 * @generated
-	 */
-	public static final int XML_ROUND_ROBIN_PARTITIONING_22 = 23;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2 <em>Xml Embeddable 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEmbeddable_2_2()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDABLE_22 = 6;
-
-	/**
-	 * The feature id for the '<em><b>Attribute Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_22__ATTRIBUTE_OVERRIDES = OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER__ATTRIBUTE_OVERRIDES;
-
-	/**
-	 * The feature id for the '<em><b>Association Overrides</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_22__ASSOCIATION_OVERRIDES = OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_22__PARENT_CLASS = OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embeddable 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_22_FEATURE_COUNT = OrmPackage.XML_ATTRIBUTE_OVERRIDE_CONTAINER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__PARTITIONING = XML_PARTITIONING_GROUP_22__PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__REPLICATION_PARTITIONING = XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__ROUND_ROBIN_PARTITIONING = XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__PINNED_PARTITIONING = XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__RANGE_PARTITIONING = XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__VALUE_PARTITIONING = XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__HASH_PARTITIONING = XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__UNION_PARTITIONING = XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__PARTITIONED = XML_PARTITIONING_GROUP_22__PARTITIONED;
-
-	/**
-	 * The feature id for the '<em><b>Additional Criteria</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__ADDITIONAL_CRITERIA = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__CASCADE_ON_DELETE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22__INDEX = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_22_FEATURE_COUNT = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22__PARTITIONING = 0;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22__REPLICATION_PARTITIONING = 1;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22__ROUND_ROBIN_PARTITIONING = 2;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22__PINNED_PARTITIONING = 3;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22__RANGE_PARTITIONING = 4;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22__VALUE_PARTITIONING = 5;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22__HASH_PARTITIONING = 6;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22__UNION_PARTITIONING = 7;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity Mappings 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_22_FEATURE_COUNT = 8;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_HASH_PARTITIONING_22__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Hash Partitioning 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_HASH_PARTITIONING_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2 <em>Xml Id 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlId_2_2()
-	 * @generated
-	 */
-	public static final int XML_ID_22 = 10;
-
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_22__INDEX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Id 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2 <em>Xml Index 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2()
-	 * @generated
-	 */
-	public static final int XML_INDEX_22 = 11;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX_22__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Schema</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX_22__SCHEMA = 1;
-
-	/**
-	 * The feature id for the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX_22__CATALOG = 2;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX_22__TABLE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX_22__UNIQUE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Column Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX_22__COLUMN_NAMES = 5;
-
-	/**
-	 * The number of structural features of the '<em>Xml Index 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_INDEX_22_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2 <em>Xml Join Table 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlJoinTable_2_2()
-	 * @generated
-	 */
-	public static final int XML_JOIN_TABLE_22 = 12;
-
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_22__CREATION_SUFFIX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Join Table 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_JOIN_TABLE_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__PARTITIONING = XML_PARTITIONING_GROUP_22__PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__REPLICATION_PARTITIONING = XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__ROUND_ROBIN_PARTITIONING = XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__PINNED_PARTITIONING = XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__RANGE_PARTITIONING = XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__VALUE_PARTITIONING = XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__HASH_PARTITIONING = XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__UNION_PARTITIONING = XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__PARTITIONED = XML_PARTITIONING_GROUP_22__PARTITIONED;
-
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__CASCADE_ON_DELETE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22__NON_CACHEABLE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To Many 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_MANY_22_FEATURE_COUNT = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__PARTITIONING = XML_PARTITIONING_GROUP_22__PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__REPLICATION_PARTITIONING = XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__ROUND_ROBIN_PARTITIONING = XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__PINNED_PARTITIONING = XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__RANGE_PARTITIONING = XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__VALUE_PARTITIONING = XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__HASH_PARTITIONING = XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__UNION_PARTITIONING = XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__PARTITIONED = XML_PARTITIONING_GROUP_22__PARTITIONED;
-
-	/**
-	 * The feature id for the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22__NON_CACHEABLE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Many To One 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MANY_TO_ONE_22_FEATURE_COUNT = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2 <em>Xml Mapped Superclass 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlMappedSuperclass_2_2()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22 = 15;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__PARTITIONING = XML_PARTITIONING_GROUP_22__PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__REPLICATION_PARTITIONING = XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__ROUND_ROBIN_PARTITIONING = XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__PINNED_PARTITIONING = XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__RANGE_PARTITIONING = XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__VALUE_PARTITIONING = XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__HASH_PARTITIONING = XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__UNION_PARTITIONING = XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__PARTITIONED = XML_PARTITIONING_GROUP_22__PARTITIONED;
-
-	/**
-	 * The feature id for the '<em><b>Additional Criteria</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22__ADDITIONAL_CRITERIA = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Mapped Superclass 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_22_FEATURE_COUNT = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__PARTITIONING = XML_PARTITIONING_GROUP_22__PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__REPLICATION_PARTITIONING = XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__ROUND_ROBIN_PARTITIONING = XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__PINNED_PARTITIONING = XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__RANGE_PARTITIONING = XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__VALUE_PARTITIONING = XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__HASH_PARTITIONING = XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__UNION_PARTITIONING = XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__PARTITIONED = XML_PARTITIONING_GROUP_22__PARTITIONED;
-
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__CASCADE_ON_DELETE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22__NON_CACHEABLE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To One 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_ONE_22_FEATURE_COUNT = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__PARTITIONING = XML_PARTITIONING_GROUP_22__PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__REPLICATION_PARTITIONING = XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__ROUND_ROBIN_PARTITIONING = XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__PINNED_PARTITIONING = XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__RANGE_PARTITIONING = XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__VALUE_PARTITIONING = XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__HASH_PARTITIONING = XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__UNION_PARTITIONING = XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__PARTITIONED = XML_PARTITIONING_GROUP_22__PARTITIONED;
-
-	/**
-	 * The feature id for the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__CASCADE_ON_DELETE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Noncacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22__NONCACHEABLE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To Many 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_22_FEATURE_COUNT = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_22__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Partitioning 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PARTITIONING_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PINNED_PARTITIONING_22__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Pinned Partitioning 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PINNED_PARTITIONING_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RANGE_PARTITIONING_22__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Range Partitioning 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_RANGE_PARTITIONING_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_REPLICATION_PARTITIONING_22__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Replication Partitioning 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_REPLICATION_PARTITIONING_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ROUND_ROBIN_PARTITIONING_22__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Round Robin Partitioning 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ROUND_ROBIN_PARTITIONING_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2 <em>Xml Secondary Table 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlSecondaryTable_2_2()
-	 * @generated
-	 */
-	public static final int XML_SECONDARY_TABLE_22 = 24;
-
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_22__CREATION_SUFFIX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Secondary Table 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_SECONDARY_TABLE_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2 <em>Xml Table 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTable_2_2()
-	 * @generated
-	 */
-	public static final int XML_TABLE_22 = 25;
-
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_22__CREATION_SUFFIX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Table 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2 <em>Xml Table Generator 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTableGenerator_2_2()
-	 * @generated
-	 */
-	public static final int XML_TABLE_GENERATOR_22 = 26;
-
-	/**
-	 * The feature id for the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_22__CREATION_SUFFIX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Table Generator 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TABLE_GENERATOR_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2 <em>Xml Union Partitioning 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlUnionPartitioning_2_2()
-	 * @generated
-	 */
-	public static final int XML_UNION_PARTITIONING_22 = 27;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_UNION_PARTITIONING_22__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Union Partitioning 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_UNION_PARTITIONING_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2 <em>Xml Value Partitioning 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlValuePartitioning_2_2()
-	 * @generated
-	 */
-	public static final int XML_VALUE_PARTITIONING_22 = 28;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VALUE_PARTITIONING_22__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Value Partitioning 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VALUE_PARTITIONING_22_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2 <em>Xml Variable One To One 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVariableOneToOne_2_2()
-	 * @generated
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22 = 29;
-
-	/**
-	 * The feature id for the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__PARTITIONING = XML_PARTITIONING_GROUP_22__PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__REPLICATION_PARTITIONING = XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__ROUND_ROBIN_PARTITIONING = XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__PINNED_PARTITIONING = XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__RANGE_PARTITIONING = XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__VALUE_PARTITIONING = XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__HASH_PARTITIONING = XML_PARTITIONING_GROUP_22__HASH_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__UNION_PARTITIONING = XML_PARTITIONING_GROUP_22__UNION_PARTITIONING;
-
-	/**
-	 * The feature id for the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__PARTITIONED = XML_PARTITIONING_GROUP_22__PARTITIONED;
-
-	/**
-	 * The feature id for the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22__NON_CACHEABLE = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Variable One To One 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VARIABLE_ONE_TO_ONE_22_FEATURE_COUNT = XML_PARTITIONING_GROUP_22_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2 <em>Xml Version 22</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVersion_2_2()
-	 * @generated
-	 */
-	public static final int XML_VERSION_22 = 30;
-
-	/**
-	 * The feature id for the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION_22__INDEX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Version 22</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_VERSION_22_FEATURE_COUNT = 1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAdditionalCriteria_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasic_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicCollection_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasicMap_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCollectionTable_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlElementCollection_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntity_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityMappings_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlHashPartitioning_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToMany_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlManyToOne_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToOne_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToMany_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPartitioning_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPartitioningGroup_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPinnedPartitioning_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlRangePartitioning_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlReplicationPartitioning_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlRoundRobinPartitioning_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddable_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlId_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlIndex_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlJoinTable_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclass_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlSecondaryTable_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTable_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTableGenerator_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlUnionPartitioning_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlValuePartitioning_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVariableOneToOne_2_2EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlVersion_2_2EClass = 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.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EclipseLinkOrmV2_2Package()
-	{
-		super(eNS_URI, EclipseLinkOrmV2_2Factory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link EclipseLinkOrmV2_2Package#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_2Package init()
-	{
-		if (isInited) return (EclipseLinkOrmV2_2Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI);
-
-		// Obtain or create and register package
-		EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV2_2Package());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
-		EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
-		EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
-		EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
-		EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) : EclipseLinkOrmV2_3Package.eINSTANCE);
-		EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) : EclipseLinkOrmV2_4Package.eINSTANCE);
-
-		// Create package meta-data objects
-		theEclipseLinkOrmV2_2Package.createPackageContents();
-		theEclipseLinkOrmPackage.createPackageContents();
-		theEclipseLinkOrmV1_1Package.createPackageContents();
-		theEclipseLinkOrmV2_0Package.createPackageContents();
-		theEclipseLinkOrmV2_1Package.createPackageContents();
-		theEclipseLinkOrmV2_3Package.createPackageContents();
-		theEclipseLinkOrmV2_4Package.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLinkOrmV2_2Package.initializePackageContents();
-		theEclipseLinkOrmPackage.initializePackageContents();
-		theEclipseLinkOrmV1_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_0Package.initializePackageContents();
-		theEclipseLinkOrmV2_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_3Package.initializePackageContents();
-		theEclipseLinkOrmV2_4Package.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLinkOrmV2_2Package.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(EclipseLinkOrmV2_2Package.eNS_URI, theEclipseLinkOrmV2_2Package);
-		return theEclipseLinkOrmV2_2Package;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2 <em>Xml Additional Criteria 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Additional Criteria 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2
-	 * @generated
-	 */
-	public EClass getXmlAdditionalCriteria_2_2()
-	{
-		return xmlAdditionalCriteria_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2#getCriteria <em>Criteria</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Criteria</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2#getCriteria()
-	 * @see #getXmlAdditionalCriteria_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlAdditionalCriteria_2_2_Criteria()
-	{
-		return (EAttribute)xmlAdditionalCriteria_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2 <em>Xml Basic 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2
-	 * @generated
-	 */
-	public EClass getXmlBasic_2_2()
-	{
-		return xmlBasic_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2#getIndex <em>Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2#getIndex()
-	 * @see #getXmlBasic_2_2()
-	 * @generated
-	 */
-	public EReference getXmlBasic_2_2_Index()
-	{
-		return (EReference)xmlBasic_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2 <em>Xml Basic Collection 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Collection 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2
-	 * @generated
-	 */
-	public EClass getXmlBasicCollection_2_2()
-	{
-		return xmlBasicCollection_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade On Delete</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2#getCascadeOnDelete()
-	 * @see #getXmlBasicCollection_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlBasicCollection_2_2_CascadeOnDelete()
-	{
-		return (EAttribute)xmlBasicCollection_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2 <em>Xml Basic Map 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic Map 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2
-	 * @generated
-	 */
-	public EClass getXmlBasicMap_2_2()
-	{
-		return xmlBasicMap_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade On Delete</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2#getCascadeOnDelete()
-	 * @see #getXmlBasicMap_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlBasicMap_2_2_CascadeOnDelete()
-	{
-		return (EAttribute)xmlBasicMap_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2 <em>Xml Collection Table 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Collection Table 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2
-	 * @generated
-	 */
-	public EClass getXmlCollectionTable_2_2()
-	{
-		return xmlCollectionTable_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2#getCreationSuffix <em>Creation Suffix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Suffix</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2#getCreationSuffix()
-	 * @see #getXmlCollectionTable_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlCollectionTable_2_2_CreationSuffix()
-	{
-		return (EAttribute)xmlCollectionTable_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2 <em>Xml Element Collection 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Element Collection 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2
-	 * @generated
-	 */
-	public EClass getXmlElementCollection_2_2()
-	{
-		return xmlElementCollection_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade On Delete</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2#getCascadeOnDelete()
-	 * @see #getXmlElementCollection_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlElementCollection_2_2_CascadeOnDelete()
-	{
-		return (EAttribute)xmlElementCollection_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2#isNoncacheable <em>Noncacheable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Noncacheable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2#isNoncacheable()
-	 * @see #getXmlElementCollection_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlElementCollection_2_2_Noncacheable()
-	{
-		return (EAttribute)xmlElementCollection_2_2EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2 <em>Xml Entity 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2
-	 * @generated
-	 */
-	public EClass getXmlEntity_2_2()
-	{
-		return xmlEntity_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade On Delete</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getCascadeOnDelete()
-	 * @see #getXmlEntity_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlEntity_2_2_CascadeOnDelete()
-	{
-		return (EAttribute)xmlEntity_2_2EClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getIndex <em>Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getIndex()
-	 * @see #getXmlEntity_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_2_Index()
-	{
-		return (EReference)xmlEntity_2_2EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2 <em>Xml Entity Mappings 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity Mappings 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2
-	 * @generated
-	 */
-	public EClass getXmlEntityMappings_2_2()
-	{
-		return xmlEntityMappings_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getPartitioning <em>Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getPartitioning()
-	 * @see #getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_2_Partitioning()
-	{
-		return (EReference)xmlEntityMappings_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getReplicationPartitioning <em>Replication Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Replication Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getReplicationPartitioning()
-	 * @see #getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_2_ReplicationPartitioning()
-	{
-		return (EReference)xmlEntityMappings_2_2EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Round Robin Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getRoundRobinPartitioning()
-	 * @see #getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_2_RoundRobinPartitioning()
-	{
-		return (EReference)xmlEntityMappings_2_2EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getPinnedPartitioning <em>Pinned Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pinned Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getPinnedPartitioning()
-	 * @see #getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_2_PinnedPartitioning()
-	{
-		return (EReference)xmlEntityMappings_2_2EClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getRangePartitioning <em>Range Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Range Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getRangePartitioning()
-	 * @see #getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_2_RangePartitioning()
-	{
-		return (EReference)xmlEntityMappings_2_2EClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getValuePartitioning <em>Value Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Value Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getValuePartitioning()
-	 * @see #getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_2_ValuePartitioning()
-	{
-		return (EReference)xmlEntityMappings_2_2EClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getHashPartitioning <em>Hash Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Hash Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getHashPartitioning()
-	 * @see #getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_2_HashPartitioning()
-	{
-		return (EReference)xmlEntityMappings_2_2EClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getUnionPartitioning <em>Union Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Union Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getUnionPartitioning()
-	 * @see #getXmlEntityMappings_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_2_UnionPartitioning()
-	{
-		return (EReference)xmlEntityMappings_2_2EClass.getEStructuralFeatures().get(7);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2 <em>Xml Hash Partitioning 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Hash Partitioning 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2
-	 * @generated
-	 */
-	public EClass getXmlHashPartitioning_2_2()
-	{
-		return xmlHashPartitioning_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2#getName()
-	 * @see #getXmlHashPartitioning_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlHashPartitioning_2_2_Name()
-	{
-		return (EAttribute)xmlHashPartitioning_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getAdditionalCriteria <em>Additional Criteria</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Additional Criteria</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getAdditionalCriteria()
-	 * @see #getXmlEntity_2_2()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_2_AdditionalCriteria()
-	{
-		return (EReference)xmlEntity_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2 <em>Xml Many To Many 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To Many 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2
-	 * @generated
-	 */
-	public EClass getXmlManyToMany_2_2()
-	{
-		return xmlManyToMany_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade On Delete</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2#getCascadeOnDelete()
-	 * @see #getXmlManyToMany_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlManyToMany_2_2_CascadeOnDelete()
-	{
-		return (EAttribute)xmlManyToMany_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2#isNonCacheable <em>Non Cacheable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Non Cacheable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2#isNonCacheable()
-	 * @see #getXmlManyToMany_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlManyToMany_2_2_NonCacheable()
-	{
-		return (EAttribute)xmlManyToMany_2_2EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2 <em>Xml Many To One 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Many To One 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2
-	 * @generated
-	 */
-	public EClass getXmlManyToOne_2_2()
-	{
-		return xmlManyToOne_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2#isNonCacheable <em>Non Cacheable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Non Cacheable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2#isNonCacheable()
-	 * @see #getXmlManyToOne_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlManyToOne_2_2_NonCacheable()
-	{
-		return (EAttribute)xmlManyToOne_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2 <em>Xml One To One 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To One 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2
-	 * @generated
-	 */
-	public EClass getXmlOneToOne_2_2()
-	{
-		return xmlOneToOne_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade On Delete</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2#getCascadeOnDelete()
-	 * @see #getXmlOneToOne_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlOneToOne_2_2_CascadeOnDelete()
-	{
-		return (EAttribute)xmlOneToOne_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2#isNonCacheable <em>Non Cacheable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Non Cacheable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2#isNonCacheable()
-	 * @see #getXmlOneToOne_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlOneToOne_2_2_NonCacheable()
-	{
-		return (EAttribute)xmlOneToOne_2_2EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2 <em>Xml One To Many 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To Many 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2
-	 * @generated
-	 */
-	public EClass getXmlOneToMany_2_2()
-	{
-		return xmlOneToMany_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Cascade On Delete</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2#getCascadeOnDelete()
-	 * @see #getXmlOneToMany_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlOneToMany_2_2_CascadeOnDelete()
-	{
-		return (EAttribute)xmlOneToMany_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2#isNoncacheable <em>Noncacheable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Noncacheable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2#isNoncacheable()
-	 * @see #getXmlOneToMany_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlOneToMany_2_2_Noncacheable()
-	{
-		return (EAttribute)xmlOneToMany_2_2EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2 <em>Xml Partitioning 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Partitioning 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2
-	 * @generated
-	 */
-	public EClass getXmlPartitioning_2_2()
-	{
-		return xmlPartitioning_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2#getName()
-	 * @see #getXmlPartitioning_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlPartitioning_2_2_Name()
-	{
-		return (EAttribute)xmlPartitioning_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2 <em>Xml Partitioning Group 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Partitioning Group 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2
-	 * @generated
-	 */
-	public EClass getXmlPartitioningGroup_2_2()
-	{
-		return xmlPartitioningGroup_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioning <em>Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioning()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EReference getXmlPartitioningGroup_2_2_Partitioning()
-	{
-		return (EReference)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getReplicationPartitioning <em>Replication Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Replication Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getReplicationPartitioning()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EReference getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	{
-		return (EReference)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Round Robin Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRoundRobinPartitioning()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EReference getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	{
-		return (EReference)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPinnedPartitioning <em>Pinned Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Pinned Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPinnedPartitioning()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EReference getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	{
-		return (EReference)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRangePartitioning <em>Range Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Range Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRangePartitioning()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EReference getXmlPartitioningGroup_2_2_RangePartitioning()
-	{
-		return (EReference)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getValuePartitioning <em>Value Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Value Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getValuePartitioning()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EReference getXmlPartitioningGroup_2_2_ValuePartitioning()
-	{
-		return (EReference)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getHashPartitioning <em>Hash Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Hash Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getHashPartitioning()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EReference getXmlPartitioningGroup_2_2_HashPartitioning()
-	{
-		return (EReference)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getUnionPartitioning <em>Union Partitioning</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Union Partitioning</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getUnionPartitioning()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EReference getXmlPartitioningGroup_2_2_UnionPartitioning()
-	{
-		return (EReference)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(7);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioned <em>Partitioned</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Partitioned</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioned()
-	 * @see #getXmlPartitioningGroup_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlPartitioningGroup_2_2_Partitioned()
-	{
-		return (EAttribute)xmlPartitioningGroup_2_2EClass.getEStructuralFeatures().get(8);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2 <em>Xml Pinned Partitioning 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Pinned Partitioning 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2
-	 * @generated
-	 */
-	public EClass getXmlPinnedPartitioning_2_2()
-	{
-		return xmlPinnedPartitioning_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2#getName()
-	 * @see #getXmlPinnedPartitioning_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlPinnedPartitioning_2_2_Name()
-	{
-		return (EAttribute)xmlPinnedPartitioning_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2 <em>Xml Range Partitioning 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Range Partitioning 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2
-	 * @generated
-	 */
-	public EClass getXmlRangePartitioning_2_2()
-	{
-		return xmlRangePartitioning_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2#getName()
-	 * @see #getXmlRangePartitioning_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlRangePartitioning_2_2_Name()
-	{
-		return (EAttribute)xmlRangePartitioning_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2 <em>Xml Replication Partitioning 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Replication Partitioning 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2
-	 * @generated
-	 */
-	public EClass getXmlReplicationPartitioning_2_2()
-	{
-		return xmlReplicationPartitioning_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2#getName()
-	 * @see #getXmlReplicationPartitioning_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlReplicationPartitioning_2_2_Name()
-	{
-		return (EAttribute)xmlReplicationPartitioning_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2 <em>Xml Round Robin Partitioning 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Round Robin Partitioning 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2
-	 * @generated
-	 */
-	public EClass getXmlRoundRobinPartitioning_2_2()
-	{
-		return xmlRoundRobinPartitioning_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2#getName()
-	 * @see #getXmlRoundRobinPartitioning_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlRoundRobinPartitioning_2_2_Name()
-	{
-		return (EAttribute)xmlRoundRobinPartitioning_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2 <em>Xml Embeddable 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embeddable 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2
-	 * @generated
-	 */
-	public EClass getXmlEmbeddable_2_2()
-	{
-		return xmlEmbeddable_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2#getParentClass <em>Parent Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parent Class</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2#getParentClass()
-	 * @see #getXmlEmbeddable_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlEmbeddable_2_2_ParentClass()
-	{
-		return (EAttribute)xmlEmbeddable_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2 <em>Xml Id 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Id 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2
-	 * @generated
-	 */
-	public EClass getXmlId_2_2()
-	{
-		return xmlId_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2#getIndex <em>Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2#getIndex()
-	 * @see #getXmlId_2_2()
-	 * @generated
-	 */
-	public EReference getXmlId_2_2_Index()
-	{
-		return (EReference)xmlId_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2 <em>Xml Index 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Index 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2
-	 * @generated
-	 */
-	public EClass getXmlIndex_2_2()
-	{
-		return xmlIndex_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getName()
-	 * @see #getXmlIndex_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlIndex_2_2_Name()
-	{
-		return (EAttribute)xmlIndex_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getSchema <em>Schema</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Schema</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getSchema()
-	 * @see #getXmlIndex_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlIndex_2_2_Schema()
-	{
-		return (EAttribute)xmlIndex_2_2EClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getCatalog <em>Catalog</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Catalog</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getCatalog()
-	 * @see #getXmlIndex_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlIndex_2_2_Catalog()
-	{
-		return (EAttribute)xmlIndex_2_2EClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Table</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getTable()
-	 * @see #getXmlIndex_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlIndex_2_2_Table()
-	{
-		return (EAttribute)xmlIndex_2_2EClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getUnique <em>Unique</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Unique</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getUnique()
-	 * @see #getXmlIndex_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlIndex_2_2_Unique()
-	{
-		return (EAttribute)xmlIndex_2_2EClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getColumnNames <em>Column Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Column Names</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getColumnNames()
-	 * @see #getXmlIndex_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlIndex_2_2_ColumnNames()
-	{
-		return (EAttribute)xmlIndex_2_2EClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2 <em>Xml Join Table 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Join Table 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2
-	 * @generated
-	 */
-	public EClass getXmlJoinTable_2_2()
-	{
-		return xmlJoinTable_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2#getCreationSuffix <em>Creation Suffix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Suffix</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2#getCreationSuffix()
-	 * @see #getXmlJoinTable_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlJoinTable_2_2_CreationSuffix()
-	{
-		return (EAttribute)xmlJoinTable_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2 <em>Xml Mapped Superclass 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mapped Superclass 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass_2_2()
-	{
-		return xmlMappedSuperclass_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2#getAdditionalCriteria <em>Additional Criteria</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Additional Criteria</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2#getAdditionalCriteria()
-	 * @see #getXmlMappedSuperclass_2_2()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_2_AdditionalCriteria()
-	{
-		return (EReference)xmlMappedSuperclass_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2 <em>Xml Secondary Table 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Secondary Table 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2
-	 * @generated
-	 */
-	public EClass getXmlSecondaryTable_2_2()
-	{
-		return xmlSecondaryTable_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2#getCreationSuffix <em>Creation Suffix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Suffix</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2#getCreationSuffix()
-	 * @see #getXmlSecondaryTable_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlSecondaryTable_2_2_CreationSuffix()
-	{
-		return (EAttribute)xmlSecondaryTable_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2 <em>Xml Table 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Table 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2
-	 * @generated
-	 */
-	public EClass getXmlTable_2_2()
-	{
-		return xmlTable_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2#getCreationSuffix <em>Creation Suffix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Suffix</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2#getCreationSuffix()
-	 * @see #getXmlTable_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlTable_2_2_CreationSuffix()
-	{
-		return (EAttribute)xmlTable_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2 <em>Xml Table Generator 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Table Generator 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2
-	 * @generated
-	 */
-	public EClass getXmlTableGenerator_2_2()
-	{
-		return xmlTableGenerator_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2#getCreationSuffix <em>Creation Suffix</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Creation Suffix</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2#getCreationSuffix()
-	 * @see #getXmlTableGenerator_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlTableGenerator_2_2_CreationSuffix()
-	{
-		return (EAttribute)xmlTableGenerator_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2 <em>Xml Union Partitioning 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Union Partitioning 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2
-	 * @generated
-	 */
-	public EClass getXmlUnionPartitioning_2_2()
-	{
-		return xmlUnionPartitioning_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2#getName()
-	 * @see #getXmlUnionPartitioning_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlUnionPartitioning_2_2_Name()
-	{
-		return (EAttribute)xmlUnionPartitioning_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2 <em>Xml Value Partitioning 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Value Partitioning 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2
-	 * @generated
-	 */
-	public EClass getXmlValuePartitioning_2_2()
-	{
-		return xmlValuePartitioning_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2#getName()
-	 * @see #getXmlValuePartitioning_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlValuePartitioning_2_2_Name()
-	{
-		return (EAttribute)xmlValuePartitioning_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2 <em>Xml Variable One To One 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Variable One To One 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2
-	 * @generated
-	 */
-	public EClass getXmlVariableOneToOne_2_2()
-	{
-		return xmlVariableOneToOne_2_2EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2#isNonCacheable <em>Non Cacheable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Non Cacheable</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2#isNonCacheable()
-	 * @see #getXmlVariableOneToOne_2_2()
-	 * @generated
-	 */
-	public EAttribute getXmlVariableOneToOne_2_2_NonCacheable()
-	{
-		return (EAttribute)xmlVariableOneToOne_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2 <em>Xml Version 22</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Version 22</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2
-	 * @generated
-	 */
-	public EClass getXmlVersion_2_2()
-	{
-		return xmlVersion_2_2EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2#getIndex <em>Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2#getIndex()
-	 * @see #getXmlVersion_2_2()
-	 * @generated
-	 */
-	public EReference getXmlVersion_2_2_Index()
-	{
-		return (EReference)xmlVersion_2_2EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_2Factory getEclipseLinkOrmV2_2Factory()
-	{
-		return (EclipseLinkOrmV2_2Factory)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
-		xmlAdditionalCriteria_2_2EClass = createEClass(XML_ADDITIONAL_CRITERIA_22);
-		createEAttribute(xmlAdditionalCriteria_2_2EClass, XML_ADDITIONAL_CRITERIA_22__CRITERIA);
-
-		xmlBasic_2_2EClass = createEClass(XML_BASIC_22);
-		createEReference(xmlBasic_2_2EClass, XML_BASIC_22__INDEX);
-
-		xmlBasicCollection_2_2EClass = createEClass(XML_BASIC_COLLECTION_22);
-		createEAttribute(xmlBasicCollection_2_2EClass, XML_BASIC_COLLECTION_22__CASCADE_ON_DELETE);
-
-		xmlBasicMap_2_2EClass = createEClass(XML_BASIC_MAP_22);
-		createEAttribute(xmlBasicMap_2_2EClass, XML_BASIC_MAP_22__CASCADE_ON_DELETE);
-
-		xmlCollectionTable_2_2EClass = createEClass(XML_COLLECTION_TABLE_22);
-		createEAttribute(xmlCollectionTable_2_2EClass, XML_COLLECTION_TABLE_22__CREATION_SUFFIX);
-
-		xmlElementCollection_2_2EClass = createEClass(XML_ELEMENT_COLLECTION_22);
-		createEAttribute(xmlElementCollection_2_2EClass, XML_ELEMENT_COLLECTION_22__CASCADE_ON_DELETE);
-		createEAttribute(xmlElementCollection_2_2EClass, XML_ELEMENT_COLLECTION_22__NONCACHEABLE);
-
-		xmlEmbeddable_2_2EClass = createEClass(XML_EMBEDDABLE_22);
-		createEAttribute(xmlEmbeddable_2_2EClass, XML_EMBEDDABLE_22__PARENT_CLASS);
-
-		xmlEntity_2_2EClass = createEClass(XML_ENTITY_22);
-		createEReference(xmlEntity_2_2EClass, XML_ENTITY_22__ADDITIONAL_CRITERIA);
-		createEAttribute(xmlEntity_2_2EClass, XML_ENTITY_22__CASCADE_ON_DELETE);
-		createEReference(xmlEntity_2_2EClass, XML_ENTITY_22__INDEX);
-
-		xmlEntityMappings_2_2EClass = createEClass(XML_ENTITY_MAPPINGS_22);
-		createEReference(xmlEntityMappings_2_2EClass, XML_ENTITY_MAPPINGS_22__PARTITIONING);
-		createEReference(xmlEntityMappings_2_2EClass, XML_ENTITY_MAPPINGS_22__REPLICATION_PARTITIONING);
-		createEReference(xmlEntityMappings_2_2EClass, XML_ENTITY_MAPPINGS_22__ROUND_ROBIN_PARTITIONING);
-		createEReference(xmlEntityMappings_2_2EClass, XML_ENTITY_MAPPINGS_22__PINNED_PARTITIONING);
-		createEReference(xmlEntityMappings_2_2EClass, XML_ENTITY_MAPPINGS_22__RANGE_PARTITIONING);
-		createEReference(xmlEntityMappings_2_2EClass, XML_ENTITY_MAPPINGS_22__VALUE_PARTITIONING);
-		createEReference(xmlEntityMappings_2_2EClass, XML_ENTITY_MAPPINGS_22__HASH_PARTITIONING);
-		createEReference(xmlEntityMappings_2_2EClass, XML_ENTITY_MAPPINGS_22__UNION_PARTITIONING);
-
-		xmlHashPartitioning_2_2EClass = createEClass(XML_HASH_PARTITIONING_22);
-		createEAttribute(xmlHashPartitioning_2_2EClass, XML_HASH_PARTITIONING_22__NAME);
-
-		xmlId_2_2EClass = createEClass(XML_ID_22);
-		createEReference(xmlId_2_2EClass, XML_ID_22__INDEX);
-
-		xmlIndex_2_2EClass = createEClass(XML_INDEX_22);
-		createEAttribute(xmlIndex_2_2EClass, XML_INDEX_22__NAME);
-		createEAttribute(xmlIndex_2_2EClass, XML_INDEX_22__SCHEMA);
-		createEAttribute(xmlIndex_2_2EClass, XML_INDEX_22__CATALOG);
-		createEAttribute(xmlIndex_2_2EClass, XML_INDEX_22__TABLE);
-		createEAttribute(xmlIndex_2_2EClass, XML_INDEX_22__UNIQUE);
-		createEAttribute(xmlIndex_2_2EClass, XML_INDEX_22__COLUMN_NAMES);
-
-		xmlJoinTable_2_2EClass = createEClass(XML_JOIN_TABLE_22);
-		createEAttribute(xmlJoinTable_2_2EClass, XML_JOIN_TABLE_22__CREATION_SUFFIX);
-
-		xmlManyToMany_2_2EClass = createEClass(XML_MANY_TO_MANY_22);
-		createEAttribute(xmlManyToMany_2_2EClass, XML_MANY_TO_MANY_22__CASCADE_ON_DELETE);
-		createEAttribute(xmlManyToMany_2_2EClass, XML_MANY_TO_MANY_22__NON_CACHEABLE);
-
-		xmlManyToOne_2_2EClass = createEClass(XML_MANY_TO_ONE_22);
-		createEAttribute(xmlManyToOne_2_2EClass, XML_MANY_TO_ONE_22__NON_CACHEABLE);
-
-		xmlMappedSuperclass_2_2EClass = createEClass(XML_MAPPED_SUPERCLASS_22);
-		createEReference(xmlMappedSuperclass_2_2EClass, XML_MAPPED_SUPERCLASS_22__ADDITIONAL_CRITERIA);
-
-		xmlOneToOne_2_2EClass = createEClass(XML_ONE_TO_ONE_22);
-		createEAttribute(xmlOneToOne_2_2EClass, XML_ONE_TO_ONE_22__CASCADE_ON_DELETE);
-		createEAttribute(xmlOneToOne_2_2EClass, XML_ONE_TO_ONE_22__NON_CACHEABLE);
-
-		xmlOneToMany_2_2EClass = createEClass(XML_ONE_TO_MANY_22);
-		createEAttribute(xmlOneToMany_2_2EClass, XML_ONE_TO_MANY_22__CASCADE_ON_DELETE);
-		createEAttribute(xmlOneToMany_2_2EClass, XML_ONE_TO_MANY_22__NONCACHEABLE);
-
-		xmlPartitioning_2_2EClass = createEClass(XML_PARTITIONING_22);
-		createEAttribute(xmlPartitioning_2_2EClass, XML_PARTITIONING_22__NAME);
-
-		xmlPartitioningGroup_2_2EClass = createEClass(XML_PARTITIONING_GROUP_22);
-		createEReference(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__PARTITIONING);
-		createEReference(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING);
-		createEReference(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING);
-		createEReference(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING);
-		createEReference(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING);
-		createEReference(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING);
-		createEReference(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__HASH_PARTITIONING);
-		createEReference(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__UNION_PARTITIONING);
-		createEAttribute(xmlPartitioningGroup_2_2EClass, XML_PARTITIONING_GROUP_22__PARTITIONED);
-
-		xmlPinnedPartitioning_2_2EClass = createEClass(XML_PINNED_PARTITIONING_22);
-		createEAttribute(xmlPinnedPartitioning_2_2EClass, XML_PINNED_PARTITIONING_22__NAME);
-
-		xmlRangePartitioning_2_2EClass = createEClass(XML_RANGE_PARTITIONING_22);
-		createEAttribute(xmlRangePartitioning_2_2EClass, XML_RANGE_PARTITIONING_22__NAME);
-
-		xmlReplicationPartitioning_2_2EClass = createEClass(XML_REPLICATION_PARTITIONING_22);
-		createEAttribute(xmlReplicationPartitioning_2_2EClass, XML_REPLICATION_PARTITIONING_22__NAME);
-
-		xmlRoundRobinPartitioning_2_2EClass = createEClass(XML_ROUND_ROBIN_PARTITIONING_22);
-		createEAttribute(xmlRoundRobinPartitioning_2_2EClass, XML_ROUND_ROBIN_PARTITIONING_22__NAME);
-
-		xmlSecondaryTable_2_2EClass = createEClass(XML_SECONDARY_TABLE_22);
-		createEAttribute(xmlSecondaryTable_2_2EClass, XML_SECONDARY_TABLE_22__CREATION_SUFFIX);
-
-		xmlTable_2_2EClass = createEClass(XML_TABLE_22);
-		createEAttribute(xmlTable_2_2EClass, XML_TABLE_22__CREATION_SUFFIX);
-
-		xmlTableGenerator_2_2EClass = createEClass(XML_TABLE_GENERATOR_22);
-		createEAttribute(xmlTableGenerator_2_2EClass, XML_TABLE_GENERATOR_22__CREATION_SUFFIX);
-
-		xmlUnionPartitioning_2_2EClass = createEClass(XML_UNION_PARTITIONING_22);
-		createEAttribute(xmlUnionPartitioning_2_2EClass, XML_UNION_PARTITIONING_22__NAME);
-
-		xmlValuePartitioning_2_2EClass = createEClass(XML_VALUE_PARTITIONING_22);
-		createEAttribute(xmlValuePartitioning_2_2EClass, XML_VALUE_PARTITIONING_22__NAME);
-
-		xmlVariableOneToOne_2_2EClass = createEClass(XML_VARIABLE_ONE_TO_ONE_22);
-		createEAttribute(xmlVariableOneToOne_2_2EClass, XML_VARIABLE_ONE_TO_ONE_22__NON_CACHEABLE);
-
-		xmlVersion_2_2EClass = createEClass(XML_VERSION_22);
-		createEReference(xmlVersion_2_2EClass, XML_VERSION_22__INDEX);
-	}
-
-	/**
-	 * <!-- 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
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-		OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		xmlElementCollection_2_2EClass.getESuperTypes().add(this.getXmlPartitioningGroup_2_2());
-		xmlEmbeddable_2_2EClass.getESuperTypes().add(theOrmPackage.getXmlAttributeOverrideContainer());
-		xmlEmbeddable_2_2EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer());
-		xmlEntity_2_2EClass.getESuperTypes().add(this.getXmlPartitioningGroup_2_2());
-		xmlManyToMany_2_2EClass.getESuperTypes().add(this.getXmlPartitioningGroup_2_2());
-		xmlManyToOne_2_2EClass.getESuperTypes().add(this.getXmlPartitioningGroup_2_2());
-		xmlMappedSuperclass_2_2EClass.getESuperTypes().add(this.getXmlPartitioningGroup_2_2());
-		xmlOneToOne_2_2EClass.getESuperTypes().add(this.getXmlPartitioningGroup_2_2());
-		xmlOneToMany_2_2EClass.getESuperTypes().add(this.getXmlPartitioningGroup_2_2());
-		xmlVariableOneToOne_2_2EClass.getESuperTypes().add(this.getXmlPartitioningGroup_2_2());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlAdditionalCriteria_2_2EClass, XmlAdditionalCriteria_2_2.class, "XmlAdditionalCriteria_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlAdditionalCriteria_2_2_Criteria(), theXMLTypePackage.getString(), "criteria", null, 0, 1, XmlAdditionalCriteria_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasic_2_2EClass, XmlBasic_2_2.class, "XmlBasic_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBasic_2_2_Index(), this.getXmlIndex_2_2(), null, "index", null, 0, 1, XmlBasic_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasicCollection_2_2EClass, XmlBasicCollection_2_2.class, "XmlBasicCollection_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlBasicCollection_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlBasicCollection_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasicMap_2_2EClass, XmlBasicMap_2_2.class, "XmlBasicMap_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlBasicMap_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlBasicMap_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCollectionTable_2_2EClass, XmlCollectionTable_2_2.class, "XmlCollectionTable_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlCollectionTable_2_2_CreationSuffix(), theXMLTypePackage.getString(), "creationSuffix", null, 0, 1, XmlCollectionTable_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlElementCollection_2_2EClass, XmlElementCollection_2_2.class, "XmlElementCollection_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlElementCollection_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlElementCollection_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlElementCollection_2_2_Noncacheable(), theXMLTypePackage.getBoolean(), "noncacheable", null, 0, 1, XmlElementCollection_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEmbeddable_2_2EClass, XmlEmbeddable_2_2.class, "XmlEmbeddable_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlEmbeddable_2_2_ParentClass(), theXMLTypePackage.getString(), "parentClass", null, 0, 1, XmlEmbeddable_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntity_2_2EClass, XmlEntity_2_2.class, "XmlEntity_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntity_2_2_AdditionalCriteria(), this.getXmlAdditionalCriteria_2_2(), null, "additionalCriteria", null, 0, 1, XmlEntity_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlEntity_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlEntity_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_2_2_Index(), this.getXmlIndex_2_2(), null, "index", null, 0, 1, XmlEntity_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntityMappings_2_2EClass, XmlEntityMappings_2_2.class, "XmlEntityMappings_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntityMappings_2_2_Partitioning(), this.getXmlPartitioning_2_2(), null, "partitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_2_ReplicationPartitioning(), this.getXmlReplicationPartitioning_2_2(), null, "replicationPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_2_RoundRobinPartitioning(), this.getXmlRoundRobinPartitioning_2_2(), null, "roundRobinPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_2_PinnedPartitioning(), this.getXmlPinnedPartitioning_2_2(), null, "pinnedPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_2_RangePartitioning(), this.getXmlRangePartitioning_2_2(), null, "rangePartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_2_ValuePartitioning(), this.getXmlValuePartitioning_2_2(), null, "valuePartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_2_HashPartitioning(), this.getXmlHashPartitioning_2_2(), null, "hashPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_2_UnionPartitioning(), this.getXmlUnionPartitioning_2_2(), null, "unionPartitioning", null, 0, -1, XmlEntityMappings_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlHashPartitioning_2_2EClass, XmlHashPartitioning_2_2.class, "XmlHashPartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlHashPartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlHashPartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlId_2_2EClass, XmlId_2_2.class, "XmlId_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlId_2_2_Index(), this.getXmlIndex_2_2(), null, "index", null, 0, 1, XmlId_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlIndex_2_2EClass, XmlIndex_2_2.class, "XmlIndex_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlIndex_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlIndex_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlIndex_2_2_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, XmlIndex_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlIndex_2_2_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, XmlIndex_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlIndex_2_2_Table(), theXMLTypePackage.getString(), "table", null, 0, 1, XmlIndex_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlIndex_2_2_Unique(), theXMLTypePackage.getBooleanObject(), "unique", null, 0, 1, XmlIndex_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlIndex_2_2_ColumnNames(), theXMLTypePackage.getString(), "columnNames", null, 0, -1, XmlIndex_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlJoinTable_2_2EClass, XmlJoinTable_2_2.class, "XmlJoinTable_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlJoinTable_2_2_CreationSuffix(), theXMLTypePackage.getString(), "creationSuffix", null, 0, 1, XmlJoinTable_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlManyToMany_2_2EClass, XmlManyToMany_2_2.class, "XmlManyToMany_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlManyToMany_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlManyToMany_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlManyToMany_2_2_NonCacheable(), theXMLTypePackage.getBoolean(), "nonCacheable", null, 0, 1, XmlManyToMany_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlManyToOne_2_2EClass, XmlManyToOne_2_2.class, "XmlManyToOne_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlManyToOne_2_2_NonCacheable(), theXMLTypePackage.getBoolean(), "nonCacheable", null, 0, 1, XmlManyToOne_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMappedSuperclass_2_2EClass, XmlMappedSuperclass_2_2.class, "XmlMappedSuperclass_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMappedSuperclass_2_2_AdditionalCriteria(), this.getXmlAdditionalCriteria_2_2(), null, "additionalCriteria", null, 0, 1, XmlMappedSuperclass_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToOne_2_2EClass, XmlOneToOne_2_2.class, "XmlOneToOne_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlOneToOne_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlOneToOne_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlOneToOne_2_2_NonCacheable(), theXMLTypePackage.getBoolean(), "nonCacheable", null, 0, 1, XmlOneToOne_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToMany_2_2EClass, XmlOneToMany_2_2.class, "XmlOneToMany_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlOneToMany_2_2_CascadeOnDelete(), theXMLTypePackage.getBooleanObject(), "cascadeOnDelete", null, 0, 1, XmlOneToMany_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlOneToMany_2_2_Noncacheable(), theXMLTypePackage.getBoolean(), "noncacheable", null, 0, 1, XmlOneToMany_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPartitioning_2_2EClass, XmlPartitioning_2_2.class, "XmlPartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPartitioningGroup_2_2EClass, XmlPartitioningGroup_2_2.class, "XmlPartitioningGroup_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlPartitioningGroup_2_2_Partitioning(), this.getXmlPartitioning_2_2(), null, "partitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPartitioningGroup_2_2_ReplicationPartitioning(), this.getXmlReplicationPartitioning_2_2(), null, "replicationPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPartitioningGroup_2_2_RoundRobinPartitioning(), this.getXmlRoundRobinPartitioning_2_2(), null, "roundRobinPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPartitioningGroup_2_2_PinnedPartitioning(), this.getXmlPinnedPartitioning_2_2(), null, "pinnedPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPartitioningGroup_2_2_RangePartitioning(), this.getXmlRangePartitioning_2_2(), null, "rangePartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPartitioningGroup_2_2_ValuePartitioning(), this.getXmlValuePartitioning_2_2(), null, "valuePartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPartitioningGroup_2_2_HashPartitioning(), this.getXmlHashPartitioning_2_2(), null, "hashPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlPartitioningGroup_2_2_UnionPartitioning(), this.getXmlUnionPartitioning_2_2(), null, "unionPartitioning", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlPartitioningGroup_2_2_Partitioned(), theXMLTypePackage.getString(), "partitioned", null, 0, 1, XmlPartitioningGroup_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPinnedPartitioning_2_2EClass, XmlPinnedPartitioning_2_2.class, "XmlPinnedPartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPinnedPartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPinnedPartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlRangePartitioning_2_2EClass, XmlRangePartitioning_2_2.class, "XmlRangePartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlRangePartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlRangePartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlReplicationPartitioning_2_2EClass, XmlReplicationPartitioning_2_2.class, "XmlReplicationPartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlReplicationPartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlReplicationPartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlRoundRobinPartitioning_2_2EClass, XmlRoundRobinPartitioning_2_2.class, "XmlRoundRobinPartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlRoundRobinPartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlRoundRobinPartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlSecondaryTable_2_2EClass, XmlSecondaryTable_2_2.class, "XmlSecondaryTable_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlSecondaryTable_2_2_CreationSuffix(), theXMLTypePackage.getString(), "creationSuffix", null, 0, 1, XmlSecondaryTable_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTable_2_2EClass, XmlTable_2_2.class, "XmlTable_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTable_2_2_CreationSuffix(), theXMLTypePackage.getString(), "creationSuffix", null, 0, 1, XmlTable_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTableGenerator_2_2EClass, XmlTableGenerator_2_2.class, "XmlTableGenerator_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTableGenerator_2_2_CreationSuffix(), theXMLTypePackage.getString(), "creationSuffix", null, 0, 1, XmlTableGenerator_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlUnionPartitioning_2_2EClass, XmlUnionPartitioning_2_2.class, "XmlUnionPartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlUnionPartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlUnionPartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlValuePartitioning_2_2EClass, XmlValuePartitioning_2_2.class, "XmlValuePartitioning_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlValuePartitioning_2_2_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlValuePartitioning_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlVariableOneToOne_2_2EClass, XmlVariableOneToOne_2_2.class, "XmlVariableOneToOne_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlVariableOneToOne_2_2_NonCacheable(), theXMLTypePackage.getBoolean(), "nonCacheable", null, 0, 1, XmlVariableOneToOne_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlVersion_2_2EClass, XmlVersion_2_2.class, "XmlVersion_2_2", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlVersion_2_2_Index(), this.getXmlIndex_2_2(), null, "index", null, 0, 1, XmlVersion_2_2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-	}
-
-	/**
-	 * <!-- 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.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2 <em>Xml Additional Criteria 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlAdditionalCriteria_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_ADDITIONAL_CRITERIA_22 = eINSTANCE.getXmlAdditionalCriteria_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Criteria</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ADDITIONAL_CRITERIA_22__CRITERIA = eINSTANCE.getXmlAdditionalCriteria_2_2_Criteria();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2 <em>Xml Basic 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasic_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_22 = eINSTANCE.getXmlBasic_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Index</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_BASIC_22__INDEX = eINSTANCE.getXmlBasic_2_2_Index();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2 <em>Xml Basic Collection 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicCollection_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_COLLECTION_22 = eINSTANCE.getXmlBasicCollection_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade On Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC_COLLECTION_22__CASCADE_ON_DELETE = eINSTANCE.getXmlBasicCollection_2_2_CascadeOnDelete();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2 <em>Xml Basic Map 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicMap_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_MAP_22 = eINSTANCE.getXmlBasicMap_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade On Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_BASIC_MAP_22__CASCADE_ON_DELETE = eINSTANCE.getXmlBasicMap_2_2_CascadeOnDelete();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2 <em>Xml Collection Table 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlCollectionTable_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_COLLECTION_TABLE_22 = eINSTANCE.getXmlCollectionTable_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Creation Suffix</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_COLLECTION_TABLE_22__CREATION_SUFFIX = eINSTANCE.getXmlCollectionTable_2_2_CreationSuffix();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2 <em>Xml Element Collection 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlElementCollection_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_ELEMENT_COLLECTION_22 = eINSTANCE.getXmlElementCollection_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade On Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ELEMENT_COLLECTION_22__CASCADE_ON_DELETE = eINSTANCE.getXmlElementCollection_2_2_CascadeOnDelete();
-
-		/**
-		 * The meta object literal for the '<em><b>Noncacheable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ELEMENT_COLLECTION_22__NONCACHEABLE = eINSTANCE.getXmlElementCollection_2_2_Noncacheable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2 <em>Xml Entity 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntity_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_22 = eINSTANCE.getXmlEntity_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade On Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ENTITY_22__CASCADE_ON_DELETE = eINSTANCE.getXmlEntity_2_2_CascadeOnDelete();
-
-		/**
-		 * The meta object literal for the '<em><b>Index</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_22__INDEX = eINSTANCE.getXmlEntity_2_2_Index();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2 <em>Xml Entity Mappings 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_MAPPINGS_22 = eINSTANCE.getXmlEntityMappings_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Partitioning</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_22__PARTITIONING = eINSTANCE.getXmlEntityMappings_2_2_Partitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Replication Partitioning</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_22__REPLICATION_PARTITIONING = eINSTANCE.getXmlEntityMappings_2_2_ReplicationPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Round Robin Partitioning</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_22__ROUND_ROBIN_PARTITIONING = eINSTANCE.getXmlEntityMappings_2_2_RoundRobinPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Pinned Partitioning</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_22__PINNED_PARTITIONING = eINSTANCE.getXmlEntityMappings_2_2_PinnedPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Range Partitioning</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_22__RANGE_PARTITIONING = eINSTANCE.getXmlEntityMappings_2_2_RangePartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Value Partitioning</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_22__VALUE_PARTITIONING = eINSTANCE.getXmlEntityMappings_2_2_ValuePartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Hash Partitioning</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_22__HASH_PARTITIONING = eINSTANCE.getXmlEntityMappings_2_2_HashPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Union Partitioning</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_22__UNION_PARTITIONING = eINSTANCE.getXmlEntityMappings_2_2_UnionPartitioning();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2 <em>Xml Hash Partitioning 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlHashPartitioning_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_HASH_PARTITIONING_22 = eINSTANCE.getXmlHashPartitioning_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_HASH_PARTITIONING_22__NAME = eINSTANCE.getXmlHashPartitioning_2_2_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Additional Criteria</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_22__ADDITIONAL_CRITERIA = eINSTANCE.getXmlEntity_2_2_AdditionalCriteria();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2 <em>Xml Many To Many 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToMany_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_MANY_22 = eINSTANCE.getXmlManyToMany_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade On Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MANY_TO_MANY_22__CASCADE_ON_DELETE = eINSTANCE.getXmlManyToMany_2_2_CascadeOnDelete();
-
-		/**
-		 * The meta object literal for the '<em><b>Non Cacheable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MANY_TO_MANY_22__NON_CACHEABLE = eINSTANCE.getXmlManyToMany_2_2_NonCacheable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2 <em>Xml Many To One 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToOne_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_MANY_TO_ONE_22 = eINSTANCE.getXmlManyToOne_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Non Cacheable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MANY_TO_ONE_22__NON_CACHEABLE = eINSTANCE.getXmlManyToOne_2_2_NonCacheable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2 <em>Xml One To One 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToOne_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_ONE_22 = eINSTANCE.getXmlOneToOne_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade On Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ONE_TO_ONE_22__CASCADE_ON_DELETE = eINSTANCE.getXmlOneToOne_2_2_CascadeOnDelete();
-
-		/**
-		 * The meta object literal for the '<em><b>Non Cacheable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ONE_TO_ONE_22__NON_CACHEABLE = eINSTANCE.getXmlOneToOne_2_2_NonCacheable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2 <em>Xml One To Many 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToMany_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY_22 = eINSTANCE.getXmlOneToMany_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Cascade On Delete</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ONE_TO_MANY_22__CASCADE_ON_DELETE = eINSTANCE.getXmlOneToMany_2_2_CascadeOnDelete();
-
-		/**
-		 * The meta object literal for the '<em><b>Noncacheable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ONE_TO_MANY_22__NONCACHEABLE = eINSTANCE.getXmlOneToMany_2_2_Noncacheable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2 <em>Xml Partitioning 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioning_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_PARTITIONING_22 = eINSTANCE.getXmlPartitioning_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PARTITIONING_22__NAME = eINSTANCE.getXmlPartitioning_2_2_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2 <em>Xml Partitioning Group 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_PARTITIONING_GROUP_22 = eINSTANCE.getXmlPartitioningGroup_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Partitioning</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PARTITIONING_GROUP_22__PARTITIONING = eINSTANCE.getXmlPartitioningGroup_2_2_Partitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Replication Partitioning</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PARTITIONING_GROUP_22__REPLICATION_PARTITIONING = eINSTANCE.getXmlPartitioningGroup_2_2_ReplicationPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Round Robin Partitioning</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PARTITIONING_GROUP_22__ROUND_ROBIN_PARTITIONING = eINSTANCE.getXmlPartitioningGroup_2_2_RoundRobinPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Pinned Partitioning</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PARTITIONING_GROUP_22__PINNED_PARTITIONING = eINSTANCE.getXmlPartitioningGroup_2_2_PinnedPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Range Partitioning</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PARTITIONING_GROUP_22__RANGE_PARTITIONING = eINSTANCE.getXmlPartitioningGroup_2_2_RangePartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Value Partitioning</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PARTITIONING_GROUP_22__VALUE_PARTITIONING = eINSTANCE.getXmlPartitioningGroup_2_2_ValuePartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Hash Partitioning</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PARTITIONING_GROUP_22__HASH_PARTITIONING = eINSTANCE.getXmlPartitioningGroup_2_2_HashPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Union Partitioning</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PARTITIONING_GROUP_22__UNION_PARTITIONING = eINSTANCE.getXmlPartitioningGroup_2_2_UnionPartitioning();
-
-		/**
-		 * The meta object literal for the '<em><b>Partitioned</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PARTITIONING_GROUP_22__PARTITIONED = eINSTANCE.getXmlPartitioningGroup_2_2_Partitioned();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2 <em>Xml Pinned Partitioning 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPinnedPartitioning_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_PINNED_PARTITIONING_22 = eINSTANCE.getXmlPinnedPartitioning_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PINNED_PARTITIONING_22__NAME = eINSTANCE.getXmlPinnedPartitioning_2_2_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2 <em>Xml Range Partitioning 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRangePartitioning_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_RANGE_PARTITIONING_22 = eINSTANCE.getXmlRangePartitioning_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_RANGE_PARTITIONING_22__NAME = eINSTANCE.getXmlRangePartitioning_2_2_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2 <em>Xml Replication Partitioning 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlReplicationPartitioning_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_REPLICATION_PARTITIONING_22 = eINSTANCE.getXmlReplicationPartitioning_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_REPLICATION_PARTITIONING_22__NAME = eINSTANCE.getXmlReplicationPartitioning_2_2_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2 <em>Xml Round Robin Partitioning 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRoundRobinPartitioning_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_ROUND_ROBIN_PARTITIONING_22 = eINSTANCE.getXmlRoundRobinPartitioning_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ROUND_ROBIN_PARTITIONING_22__NAME = eINSTANCE.getXmlRoundRobinPartitioning_2_2_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2 <em>Xml Embeddable 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEmbeddable_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDABLE_22 = eINSTANCE.getXmlEmbeddable_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Parent Class</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_EMBEDDABLE_22__PARENT_CLASS = eINSTANCE.getXmlEmbeddable_2_2_ParentClass();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2 <em>Xml Id 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlId_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_ID_22 = eINSTANCE.getXmlId_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Index</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ID_22__INDEX = eINSTANCE.getXmlId_2_2_Index();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2 <em>Xml Index 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_INDEX_22 = eINSTANCE.getXmlIndex_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_INDEX_22__NAME = eINSTANCE.getXmlIndex_2_2_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Schema</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_INDEX_22__SCHEMA = eINSTANCE.getXmlIndex_2_2_Schema();
-
-		/**
-		 * The meta object literal for the '<em><b>Catalog</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_INDEX_22__CATALOG = eINSTANCE.getXmlIndex_2_2_Catalog();
-
-		/**
-		 * The meta object literal for the '<em><b>Table</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_INDEX_22__TABLE = eINSTANCE.getXmlIndex_2_2_Table();
-
-		/**
-		 * The meta object literal for the '<em><b>Unique</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_INDEX_22__UNIQUE = eINSTANCE.getXmlIndex_2_2_Unique();
-
-		/**
-		 * The meta object literal for the '<em><b>Column Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_INDEX_22__COLUMN_NAMES = eINSTANCE.getXmlIndex_2_2_ColumnNames();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2 <em>Xml Join Table 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlJoinTable_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_JOIN_TABLE_22 = eINSTANCE.getXmlJoinTable_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Creation Suffix</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_JOIN_TABLE_22__CREATION_SUFFIX = eINSTANCE.getXmlJoinTable_2_2_CreationSuffix();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2 <em>Xml Mapped Superclass 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlMappedSuperclass_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPED_SUPERCLASS_22 = eINSTANCE.getXmlMappedSuperclass_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Additional Criteria</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_22__ADDITIONAL_CRITERIA = eINSTANCE.getXmlMappedSuperclass_2_2_AdditionalCriteria();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2 <em>Xml Secondary Table 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlSecondaryTable_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_SECONDARY_TABLE_22 = eINSTANCE.getXmlSecondaryTable_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Creation Suffix</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_SECONDARY_TABLE_22__CREATION_SUFFIX = eINSTANCE.getXmlSecondaryTable_2_2_CreationSuffix();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2 <em>Xml Table 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTable_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_TABLE_22 = eINSTANCE.getXmlTable_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Creation Suffix</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TABLE_22__CREATION_SUFFIX = eINSTANCE.getXmlTable_2_2_CreationSuffix();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2 <em>Xml Table Generator 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTableGenerator_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_TABLE_GENERATOR_22 = eINSTANCE.getXmlTableGenerator_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Creation Suffix</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TABLE_GENERATOR_22__CREATION_SUFFIX = eINSTANCE.getXmlTableGenerator_2_2_CreationSuffix();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2 <em>Xml Union Partitioning 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlUnionPartitioning_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_UNION_PARTITIONING_22 = eINSTANCE.getXmlUnionPartitioning_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_UNION_PARTITIONING_22__NAME = eINSTANCE.getXmlUnionPartitioning_2_2_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2 <em>Xml Value Partitioning 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlValuePartitioning_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_VALUE_PARTITIONING_22 = eINSTANCE.getXmlValuePartitioning_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_VALUE_PARTITIONING_22__NAME = eINSTANCE.getXmlValuePartitioning_2_2_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2 <em>Xml Variable One To One 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVariableOneToOne_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_VARIABLE_ONE_TO_ONE_22 = eINSTANCE.getXmlVariableOneToOne_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Non Cacheable</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_VARIABLE_ONE_TO_ONE_22__NON_CACHEABLE = eINSTANCE.getXmlVariableOneToOne_2_2_NonCacheable();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2 <em>Xml Version 22</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVersion_2_2()
-		 * @generated
-		 */
-		public static final EClass XML_VERSION_22 = eINSTANCE.getXmlVersion_2_2();
-
-		/**
-		 * The meta object literal for the '<em><b>Index</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_VERSION_22__INDEX = eINSTANCE.getXmlVersion_2_2_Index();
-
-	}
-
-} //EclipseLinkOrmV2_2Package
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
deleted file mode 100644
index 3b131f3abc..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlAdditionalCriteria_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Additional Criteria 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2#getCriteria <em>Criteria</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlAdditionalCriteria_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Criteria</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Criteria</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Criteria</em>' attribute.
-	 * @see #setCriteria(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlAdditionalCriteria_2_2_Criteria()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCriteria();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlAdditionalCriteria_2_2#getCriteria <em>Criteria</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Criteria</em>' attribute.
-	 * @see #getCriteria()
-	 * @generated
-	 */
-	void setCriteria(String value);
-
-} // XmlAdditionalCriteria_2_2
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
deleted file mode 100644
index af8f99d010..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicCollection_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Collection 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlBasicCollection_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicCollection_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getCascadeOnDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicCollection_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	void setCascadeOnDelete(Boolean value);
-
-} // XmlBasicCollection_2_2
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
deleted file mode 100644
index 1fccc92fe3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasicMap_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic Map 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlBasicMap_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasicMap_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getCascadeOnDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasicMap_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	void setCascadeOnDelete(Boolean value);
-
-} // XmlBasicMap_2_2
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
deleted file mode 100644
index 6eb2e28aca..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlBasic_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2#getIndex <em>Index</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlBasic_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(XmlIndex_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlBasic_2_2_Index()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlIndex_2_2 getIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlBasic_2_2#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	void setIndex(XmlIndex_2_2 value);
-
-} // XmlBasic_2_2
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
deleted file mode 100644
index 87dab02df6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlCollectionTable_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Collection Table 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2#getCreationSuffix <em>Creation Suffix</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlCollectionTable_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlCollectionTable_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCreationSuffix();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlCollectionTable_2_2#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	void setCreationSuffix(String value);
-
-} // XmlCollectionTable_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlElementCollection_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlElementCollection_2_2.java
deleted file mode 100644
index ebed8e887e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlElementCollection_2_2.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Element Collection 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2#isNoncacheable <em>Noncacheable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlElementCollection_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlElementCollection_2_2 extends XmlPartitioningGroup_2_2
-{
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlElementCollection_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getCascadeOnDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	void setCascadeOnDelete(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Noncacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Noncacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Noncacheable</em>' attribute.
-	 * @see #setNoncacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlElementCollection_2_2_Noncacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isNoncacheable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlElementCollection_2_2#isNoncacheable <em>Noncacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Noncacheable</em>' attribute.
-	 * @see #isNoncacheable()
-	 * @generated
-	 */
-	void setNoncacheable(boolean value);
-
-} // XmlElementCollection_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEmbeddable_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEmbeddable_2_2.java
deleted file mode 100644
index bd073d130d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEmbeddable_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverrideContainer;
-import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverrideContainer;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embeddable 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2#getParentClass <em>Parent Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEmbeddable_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEmbeddable_2_2 extends XmlAttributeOverrideContainer, XmlAssociationOverrideContainer
-{
-	/**
-	 * Returns the value of the '<em><b>Parent Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent 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>Parent Class</em>' attribute.
-	 * @see #setParentClass(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEmbeddable_2_2_ParentClass()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getParentClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEmbeddable_2_2#getParentClass <em>Parent Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Class</em>' attribute.
-	 * @see #getParentClass()
-	 * @generated
-	 */
-	void setParentClass(String value);
-
-} // XmlEmbeddable_2_2
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
deleted file mode 100644
index cb303b5216..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntityMappings_2_2.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity Mappings 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getPartitioning <em>Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getReplicationPartitioning <em>Replication Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getPinnedPartitioning <em>Pinned Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getRangePartitioning <em>Range Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getValuePartitioning <em>Value Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getHashPartitioning <em>Hash Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntityMappings_2_2#getUnionPartitioning <em>Union Partitioning</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlEntityMappings_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPartitioning_2_2> getPartitioning();
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlReplicationPartitioning_2_2> getReplicationPartitioning();
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlRoundRobinPartitioning_2_2> getRoundRobinPartitioning();
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPinnedPartitioning_2_2> getPinnedPartitioning();
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlRangePartitioning_2_2> getRangePartitioning();
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlValuePartitioning_2_2> getValuePartitioning();
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlHashPartitioning_2_2> getHashPartitioning();
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntityMappings_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlUnionPartitioning_2_2> getUnionPartitioning();
-
-} // XmlEntityMappings_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntity_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntity_2_2.java
deleted file mode 100644
index cd27063979..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlEntity_2_2.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getAdditionalCriteria <em>Additional Criteria</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getIndex <em>Index</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntity_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlEntity_2_2 extends XmlPartitioningGroup_2_2
-{
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntity_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getCascadeOnDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	void setCascadeOnDelete(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(XmlIndex_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntity_2_2_Index()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlIndex_2_2 getIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	void setIndex(XmlIndex_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Additional Criteria</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additional Criteria</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>Additional Criteria</em>' containment reference.
-	 * @see #setAdditionalCriteria(XmlAdditionalCriteria_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlEntity_2_2_AdditionalCriteria()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlAdditionalCriteria_2_2 getAdditionalCriteria();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlEntity_2_2#getAdditionalCriteria <em>Additional Criteria</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Additional Criteria</em>' containment reference.
-	 * @see #getAdditionalCriteria()
-	 * @generated
-	 */
-	void setAdditionalCriteria(XmlAdditionalCriteria_2_2 value);
-
-} // XmlEntity_2_2
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
deleted file mode 100644
index b5535220e4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlHashPartitioning_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Hash Partitioning 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlHashPartitioning_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlHashPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlHashPartitioning_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlHashPartitioning_2_2
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
deleted file mode 100644
index c0e2b70fc3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlId_2_2.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: XmlId_2_2.java,v 1.1 2011/02/06 02:13:00 kmoore Exp $
- */
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Id 22</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2#getIndex <em>Index</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlId_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(XmlIndex_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlId_2_2_Index()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlIndex_2_2 getIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlId_2_2#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	void setIndex(XmlIndex_2_2 value);
-
-} // XmlId_2_2
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
deleted file mode 100644
index 98d259385b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlIndex_2_2.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Index 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getSchema <em>Schema</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getCatalog <em>Catalog</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getUnique <em>Unique</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getColumnNames <em>Column Names</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlIndex_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Schema</b></em>' attribute.
-	 * <!-- 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 #setSchema(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2_Schema()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getSchema();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getSchema <em>Schema</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schema</em>' attribute.
-	 * @see #getSchema()
-	 * @generated
-	 */
-	void setSchema(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Catalog</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Catalog</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Catalog</em>' attribute.
-	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2_Catalog()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCatalog();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getCatalog <em>Catalog</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Catalog</em>' attribute.
-	 * @see #getCatalog()
-	 * @generated
-	 */
-	void setCatalog(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' attribute.
-	 * @see #setTable(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2_Table()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
-	 * @see #getTable()
-	 * @generated
-	 */
-	void setTable(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unique</em>' attribute.
-	 * @see #setUnique(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2_Unique()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getUnique();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlIndex_2_2#getUnique <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unique</em>' attribute.
-	 * @see #getUnique()
-	 * @generated
-	 */
-	void setUnique(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Column Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Names</em>' attribute list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlIndex_2_2_ColumnNames()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	EList<String> getColumnNames();
-
-} // XmlIndex_2_2
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
deleted file mode 100644
index 33db965771..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlJoinTable_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Join Table 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2#getCreationSuffix <em>Creation Suffix</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlJoinTable_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlJoinTable_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCreationSuffix();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlJoinTable_2_2#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	void setCreationSuffix(String value);
-
-} // XmlJoinTable_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlManyToMany_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlManyToMany_2_2.java
deleted file mode 100644
index 328c0dc19d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlManyToMany_2_2.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To Many 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2#isNonCacheable <em>Non Cacheable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToMany_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToMany_2_2 extends XmlPartitioningGroup_2_2
-{
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToMany_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getCascadeOnDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	void setCascadeOnDelete(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #setNonCacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToMany_2_2_NonCacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isNonCacheable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToMany_2_2#isNonCacheable <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #isNonCacheable()
-	 * @generated
-	 */
-	void setNonCacheable(boolean value);
-
-} // XmlManyToMany_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlManyToOne_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlManyToOne_2_2.java
deleted file mode 100644
index f9ed6b9270..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlManyToOne_2_2.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Many To One 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2#isNonCacheable <em>Non Cacheable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToOne_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlManyToOne_2_2 extends XmlPartitioningGroup_2_2
-{
-	/**
-	 * Returns the value of the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #setNonCacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlManyToOne_2_2_NonCacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isNonCacheable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlManyToOne_2_2#isNonCacheable <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #isNonCacheable()
-	 * @generated
-	 */
-	void setNonCacheable(boolean value);
-
-} // XmlManyToOne_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlMappedSuperclass_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlMappedSuperclass_2_2.java
deleted file mode 100644
index f949aa8c74..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlMappedSuperclass_2_2.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Mapped Superclass 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2#getAdditionalCriteria <em>Additional Criteria</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlMappedSuperclass_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlMappedSuperclass_2_2 extends XmlPartitioningGroup_2_2
-{
-	/**
-	 * Returns the value of the '<em><b>Additional Criteria</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additional Criteria</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>Additional Criteria</em>' containment reference.
-	 * @see #setAdditionalCriteria(XmlAdditionalCriteria_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlMappedSuperclass_2_2_AdditionalCriteria()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlAdditionalCriteria_2_2 getAdditionalCriteria();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlMappedSuperclass_2_2#getAdditionalCriteria <em>Additional Criteria</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Additional Criteria</em>' containment reference.
-	 * @see #getAdditionalCriteria()
-	 * @generated
-	 */
-	void setAdditionalCriteria(XmlAdditionalCriteria_2_2 value);
-
-} // XmlMappedSuperclass_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlOneToMany_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlOneToMany_2_2.java
deleted file mode 100644
index 6807ef6f1b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlOneToMany_2_2.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To Many 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2#isNoncacheable <em>Noncacheable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToMany_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToMany_2_2 extends XmlPartitioningGroup_2_2
-{
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToMany_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getCascadeOnDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	void setCascadeOnDelete(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Noncacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Noncacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Noncacheable</em>' attribute.
-	 * @see #setNoncacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToMany_2_2_Noncacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isNoncacheable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToMany_2_2#isNoncacheable <em>Noncacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Noncacheable</em>' attribute.
-	 * @see #isNoncacheable()
-	 * @generated
-	 */
-	void setNoncacheable(boolean value);
-
-} // XmlOneToMany_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlOneToOne_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlOneToOne_2_2.java
deleted file mode 100644
index cc745a9b5f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlOneToOne_2_2.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To One 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2#isNonCacheable <em>Non Cacheable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToOne_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlOneToOne_2_2 extends XmlPartitioningGroup_2_2
-{
-	/**
-	 * Returns the value of the '<em><b>Cascade On Delete</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cascade On Delete</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #setCascadeOnDelete(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToOne_2_2_CascadeOnDelete()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getCascadeOnDelete();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2#getCascadeOnDelete <em>Cascade On Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cascade On Delete</em>' attribute.
-	 * @see #getCascadeOnDelete()
-	 * @generated
-	 */
-	void setCascadeOnDelete(Boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #setNonCacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlOneToOne_2_2_NonCacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isNonCacheable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlOneToOne_2_2#isNonCacheable <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #isNonCacheable()
-	 * @generated
-	 */
-	void setNonCacheable(boolean value);
-
-} // XmlOneToOne_2_2
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
deleted file mode 100644
index 30dbd3998c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioningGroup_2_2.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Partitioning Group2 2</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioning <em>Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getReplicationPartitioning <em>Replication Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPinnedPartitioning <em>Pinned Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRangePartitioning <em>Range Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getValuePartitioning <em>Value Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getHashPartitioning <em>Hash Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getUnionPartitioning <em>Union Partitioning</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioned <em>Partitioned</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlPartitioningGroup_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioning</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>Partitioning</em>' containment reference.
-	 * @see #setPartitioning(XmlPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_Partitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlPartitioning_2_2 getPartitioning();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioning <em>Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioning</em>' containment reference.
-	 * @see #getPartitioning()
-	 * @generated
-	 */
-	void setPartitioning(XmlPartitioning_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Replication Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Replication Partitioning</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>Replication Partitioning</em>' containment reference.
-	 * @see #setReplicationPartitioning(XmlReplicationPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_ReplicationPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlReplicationPartitioning_2_2 getReplicationPartitioning();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getReplicationPartitioning <em>Replication Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Replication Partitioning</em>' containment reference.
-	 * @see #getReplicationPartitioning()
-	 * @generated
-	 */
-	void setReplicationPartitioning(XmlReplicationPartitioning_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Round Robin Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Round Robin Partitioning</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>Round Robin Partitioning</em>' containment reference.
-	 * @see #setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_RoundRobinPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlRoundRobinPartitioning_2_2 getRoundRobinPartitioning();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRoundRobinPartitioning <em>Round Robin Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Round Robin Partitioning</em>' containment reference.
-	 * @see #getRoundRobinPartitioning()
-	 * @generated
-	 */
-	void setRoundRobinPartitioning(XmlRoundRobinPartitioning_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Pinned Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pinned Partitioning</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>Pinned Partitioning</em>' containment reference.
-	 * @see #setPinnedPartitioning(XmlPinnedPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_PinnedPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlPinnedPartitioning_2_2 getPinnedPartitioning();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPinnedPartitioning <em>Pinned Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pinned Partitioning</em>' containment reference.
-	 * @see #getPinnedPartitioning()
-	 * @generated
-	 */
-	void setPinnedPartitioning(XmlPinnedPartitioning_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Range Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Range Partitioning</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>Range Partitioning</em>' containment reference.
-	 * @see #setRangePartitioning(XmlRangePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_RangePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlRangePartitioning_2_2 getRangePartitioning();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getRangePartitioning <em>Range Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range Partitioning</em>' containment reference.
-	 * @see #getRangePartitioning()
-	 * @generated
-	 */
-	void setRangePartitioning(XmlRangePartitioning_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Value Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Partitioning</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>Value Partitioning</em>' containment reference.
-	 * @see #setValuePartitioning(XmlValuePartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_ValuePartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlValuePartitioning_2_2 getValuePartitioning();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getValuePartitioning <em>Value Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value Partitioning</em>' containment reference.
-	 * @see #getValuePartitioning()
-	 * @generated
-	 */
-	void setValuePartitioning(XmlValuePartitioning_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Hash Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hash Partitioning</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>Hash Partitioning</em>' containment reference.
-	 * @see #setHashPartitioning(XmlHashPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_HashPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlHashPartitioning_2_2 getHashPartitioning();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getHashPartitioning <em>Hash Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hash Partitioning</em>' containment reference.
-	 * @see #getHashPartitioning()
-	 * @generated
-	 */
-	void setHashPartitioning(XmlHashPartitioning_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Union Partitioning</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Union Partitioning</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>Union Partitioning</em>' containment reference.
-	 * @see #setUnionPartitioning(XmlUnionPartitioning_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_UnionPartitioning()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlUnionPartitioning_2_2 getUnionPartitioning();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getUnionPartitioning <em>Union Partitioning</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Union Partitioning</em>' containment reference.
-	 * @see #getUnionPartitioning()
-	 * @generated
-	 */
-	void setUnionPartitioning(XmlUnionPartitioning_2_2 value);
-
-	/**
-	 * Returns the value of the '<em><b>Partitioned</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Partitioned</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Partitioned</em>' attribute.
-	 * @see #setPartitioned(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioningGroup_2_2_Partitioned()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getPartitioned();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioningGroup_2_2#getPartitioned <em>Partitioned</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Partitioned</em>' attribute.
-	 * @see #getPartitioned()
-	 * @generated
-	 */
-	void setPartitioned(String value);
-
-} // XmlPartitioningGroup2_2
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
deleted file mode 100644
index c11826e163..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPartitioning_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Partitioning 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlPartitioning_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPartitioning_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlPartitioning_2_2
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
deleted file mode 100644
index 4ff0d03d03..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlPinnedPartitioning_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Pinned Partitioning 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlPinnedPartitioning_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlPinnedPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlPinnedPartitioning_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlPinnedPartitioning_2_2
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
deleted file mode 100644
index 526a939fe6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRangePartitioning_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Range Partitioning 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlRangePartitioning_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRangePartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRangePartitioning_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlRangePartitioning_2_2
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
deleted file mode 100644
index 536dd2597c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlReplicationPartitioning_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Replication Partitioning 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlReplicationPartitioning_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlReplicationPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlReplicationPartitioning_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlReplicationPartitioning_2_2
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
deleted file mode 100644
index 7a2bb0f9d5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlRoundRobinPartitioning_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Round Robin Partitioning 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlRoundRobinPartitioning_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlRoundRobinPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlRoundRobinPartitioning_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlRoundRobinPartitioning_2_2
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
deleted file mode 100644
index 860e82acf4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlSecondaryTable_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Secondary Table 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2#getCreationSuffix <em>Creation Suffix</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlSecondaryTable_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlSecondaryTable_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCreationSuffix();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlSecondaryTable_2_2#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	void setCreationSuffix(String value);
-
-} // XmlSecondaryTable_2_2
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
deleted file mode 100644
index 6fde551d1d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTableGenerator_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Table Generator 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2#getCreationSuffix <em>Creation Suffix</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlTableGenerator_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTableGenerator_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCreationSuffix();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTableGenerator_2_2#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	void setCreationSuffix(String value);
-
-} // XmlTableGenerator_2_2
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
deleted file mode 100644
index 4a620143e3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlTable_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Table 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2#getCreationSuffix <em>Creation Suffix</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlTable_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Creation Suffix</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Suffix</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #setCreationSuffix(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlTable_2_2_CreationSuffix()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCreationSuffix();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlTable_2_2#getCreationSuffix <em>Creation Suffix</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Suffix</em>' attribute.
-	 * @see #getCreationSuffix()
-	 * @generated
-	 */
-	void setCreationSuffix(String value);
-
-} // XmlTable_2_2
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
deleted file mode 100644
index 23926069ff..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlUnionPartitioning_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Union Partitioning 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlUnionPartitioning_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlUnionPartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlUnionPartitioning_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlUnionPartitioning_2_2
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
deleted file mode 100644
index 6871869bb0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlValuePartitioning_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Value Partitioning 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlValuePartitioning_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlValuePartitioning_2_2_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlValuePartitioning_2_2#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // XmlValuePartitioning_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVariableOneToOne_2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVariableOneToOne_2_2.java
deleted file mode 100644
index ee10991c84..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVariableOneToOne_2_2.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Variable One To One 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2#isNonCacheable <em>Non Cacheable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVariableOneToOne_2_2()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlVariableOneToOne_2_2 extends XmlPartitioningGroup_2_2
-{
-	/**
-	 * Returns the value of the '<em><b>Non Cacheable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Non Cacheable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #setNonCacheable(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVariableOneToOne_2_2_NonCacheable()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isNonCacheable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVariableOneToOne_2_2#isNonCacheable <em>Non Cacheable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Non Cacheable</em>' attribute.
-	 * @see #isNonCacheable()
-	 * @generated
-	 */
-	void setNonCacheable(boolean value);
-
-} // XmlVariableOneToOne_2_2
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
deleted file mode 100644
index 6b92520779..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_2/XmlVersion_2_2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Version 22</b></em>'.
- * 
- * Provisional API: This interface is part of an interim API that is still
- * under development and expected to change significantly before reaching
- * stability. It is available at this early stage to solicit feedback from
- * pioneering adopters on the understanding that any code that uses this API
- * will almost certainly be broken (repeatedly) as the API evolves.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2#getIndex <em>Index</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlVersion_2_2 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index</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>Index</em>' containment reference.
-	 * @see #setIndex(XmlIndex_2_2)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLinkOrmV2_2Package#getXmlVersion_2_2_Index()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlIndex_2_2 getIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.XmlVersion_2_2#getIndex <em>Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index</em>' containment reference.
-	 * @see #getIndex()
-	 * @generated
-	 */
-	void setIndex(XmlIndex_2_2 value);
-
-} // XmlVersion_2_2
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java
deleted file mode 100644
index 94bca72457..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLink2_3.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
-
-
-@SuppressWarnings("nls")
-public interface EclipseLink2_3
-	extends EclipseLink2_2
-{
-	String SCHEMA_NAMESPACE = EclipseLink.SCHEMA_NAMESPACE;
-	String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_3.xsd";
-	String SCHEMA_VERSION	= "2.3";
-
-	// EclipseLink 2.3 specific nodes
-	String ARRAY = "array";
-	String COMPOSITE_MEMBER = "composite-member";
-
-	String MULTITENANT = "multitenant";
-		String MULTITENANT__TYPE = "type";
-	String MULTITENANT_TYPE = "multiltenant-type";
-
-	String NAMED_STORED_FUNCTION_QUERY = "named-stored-function-query";
-		String NAMED_STORED_FUNCTION_QUERY__NAME = "nname";
-	String NAMED_PLSQL_STORED_PROCEDURE_QUERY = "named-plsql-stored-procedure-query";
-		String NAMED_PLSQL_STORED_PROCEDURE_QUERY__NAME = "name";
-	String NAMED_PLSQL_STORED_FUNCTION_QUERY = "named-plsql-stored-function-query";
-		String NAMED_PLSQL_STORED_FUNCTION_QUERY__NAME = "name";
-	String PLSQL_RECORD = "plsql-record";
-		String PLSQL_RECORD__NAME = "name";
-	String PLSQL_TABLE = "plsql-table";
-		String PLSQL_TABLE__NAME = "name";
-	String STRUCT = "struct";
-		String STRUCT__NAME = "name";
-	String STRUCTURE = "structure";
-
-	String TENANT_DISCRIMINATOR_COLUMN = "tenant-discriminator-column";
-		String TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY = "contextProperty";
-		String TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY= "primaryKey";
-		String TENANT_DISCRIMINATOR_COLUMN__TABLE = "table";
-
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_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
deleted file mode 100644
index a9cb1f678f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Factory.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package
- * @generated
- */
-public class EclipseLinkOrmV2_3Factory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_3Factory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_3Factory init()
-	{
-		try
-		{
-			EclipseLinkOrmV2_3Factory theEclipseLinkOrmV2_3Factory = (EclipseLinkOrmV2_3Factory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.v2_3.xmi"); 
-			if (theEclipseLinkOrmV2_3Factory != null)
-			{
-				return theEclipseLinkOrmV2_3Factory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EclipseLinkOrmV2_3Factory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_3Factory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
-			case EclipseLinkOrmV2_3Package.MULTITENANT_TYPE:
-				return createMultitenantTypeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
-			case EclipseLinkOrmV2_3Package.MULTITENANT_TYPE:
-				return convertMultitenantTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MultitenantType createMultitenantTypeFromString(EDataType eDataType, String initialValue)
-	{
-		MultitenantType result = MultitenantType.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 convertMultitenantTypeToString(EDataType eDataType, Object instanceValue)
-	{
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_3Package getEclipseLinkOrmV2_3Package()
-	{
-		return (EclipseLinkOrmV2_3Package)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EclipseLinkOrmV2_3Package getPackage()
-	{
-		return EclipseLinkOrmV2_3Package.eINSTANCE;
-	}
-
-} //EclipseLinkOrmV2_3Factory
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
deleted file mode 100644
index ea7bae5498..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/EclipseLinkOrmV2_3Package.java
+++ /dev/null
@@ -1,2509 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-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_4.EclipseLinkOrmV2_4Package;
-
-/**
- * <!-- 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.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Factory
- * @model kind="package"
- * @generated
- */
-public class EclipseLinkOrmV2_3Package extends EPackageImpl
-{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNAME = "v2_3";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_URI = "jpt.eclipselink.orm.v2_3.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_3Package eINSTANCE = org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3 <em>Xml Embeddable 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEmbeddable_2_3()
-	 * @generated
-	 */
-	public static final int XML_EMBEDDABLE_23 = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3 <em>Xml Multitenant 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMultitenant_2_3()
-	 * @generated
-	 */
-	public static final int XML_MULTITENANT_23 = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3 <em>Xml Entity 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_23 = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3 <em>Xml Mapped Superclass 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_23 = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3 <em>Xml Entity Mappings 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_MAPPINGS_23 = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3 <em>Xml Named Plsql Stored Function Query 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredFunctionQuery_2_3()
-	 * @generated
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23 = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3 <em>Xml Named Plsql Stored Procedure Query 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredProcedureQuery_2_3()
-	 * @generated
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23 = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3 <em>Xml Named Stored Function Query 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredFunctionQuery_2_3()
-	 * @generated
-	 */
-	public static final int XML_NAMED_STORED_FUNCTION_QUERY_23 = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3 <em>Xml Persistence Unit Defaults 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3()
-	 * @generated
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23 = 10;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3 <em>Xml Plsql Record 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlRecord_2_3()
-	 * @generated
-	 */
-	public static final int XML_PLSQL_RECORD_23 = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3 <em>Xml Plsql Table 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlTable_2_3()
-	 * @generated
-	 */
-	public static final int XML_PLSQL_TABLE_23 = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3 <em>Xml Struct 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStruct_2_3()
-	 * @generated
-	 */
-	public static final int XML_STRUCT_23 = 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 <em>Xml Attributes 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlAttributes_2_3()
-	 * @generated
-	 */
-	public static final int XML_ATTRIBUTES_23 = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3 <em>Xml Structure 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStructure_2_3()
-	 * @generated
-	 */
-	public static final int XML_STRUCTURE_23 = 15;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3 <em>Xml Array 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlArray_2_3()
-	 * @generated
-	 */
-	public static final int XML_ARRAY_23 = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Array 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ARRAY_23_FEATURE_COUNT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Structures</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTES_23__STRUCTURES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Arrays</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTES_23__ARRAYS = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Attributes 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ATTRIBUTES_23_FEATURE_COUNT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_23__PLSQL_RECORDS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_23__PLSQL_TABLES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Struct</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_23__STRUCT = 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Embeddable 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_EMBEDDABLE_23_FEATURE_COUNT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Multitenant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_23__MULTITENANT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_23__NAMED_STORED_FUNCTION_QUERIES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES = 2;
-
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_23__PLSQL_RECORDS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_23__PLSQL_TABLES = 5;
-
-	/**
-	 * The feature id for the '<em><b>Struct</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_23__STRUCT = 6;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_23_FEATURE_COUNT = 7;
-
-	/**
-	 * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES = 2;
-
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_23__PLSQL_RECORDS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_23__PLSQL_TABLES = 5;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity Mappings 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_MAPPINGS_23_FEATURE_COUNT = 6;
-
-	/**
-	 * The feature id for the '<em><b>Multitenant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_23__MULTITENANT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_23__NAMED_STORED_FUNCTION_QUERIES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES = 2;
-
-	/**
-	 * The feature id for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_23__PLSQL_RECORDS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_23__PLSQL_TABLES = 5;
-
-	/**
-	 * The number of structural features of the '<em>Xml Mapped Superclass 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_23_FEATURE_COUNT = 6;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT_23__TYPE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT_23__TENANT_DISCRIMINATOR_COLUMNS = 1;
-
-	/**
-	 * The number of structural features of the '<em>Xml Multitenant 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT_23_FEATURE_COUNT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Named Plsql Stored Function Query 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Named Plsql Stored Procedure Query 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_FUNCTION_QUERY_23__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Named Stored Function Query 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_NAMED_STORED_FUNCTION_QUERY_23_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Persistence Unit Defaults 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_23_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PLSQL_RECORD_23__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Plsql Record 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PLSQL_RECORD_23_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PLSQL_TABLE_23__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Plsql Table 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_PLSQL_TABLE_23_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCT_23__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Struct 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCT_23_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3()
-	 * @generated
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23 = 14;
-
-	/**
-	 * The feature id for the '<em><b>Column Definition</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__COLUMN_DEFINITION = OrmPackage.XML_BASE_DISCRIMINATOR_COLUMN__COLUMN_DEFINITION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__NAME = OrmPackage.XML_BASE_DISCRIMINATOR_COLUMN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Discriminator Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__DISCRIMINATOR_TYPE = OrmPackage.XML_BASE_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Length</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__LENGTH = OrmPackage.XML_BASE_DISCRIMINATOR_COLUMN__LENGTH;
-
-	/**
-	 * The feature id for the '<em><b>Context Property</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__CONTEXT_PROPERTY = OrmPackage.XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__TABLE = OrmPackage.XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Primary Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23__PRIMARY_KEY = OrmPackage.XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Xml Tenant Discriminator Column 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_TENANT_DISCRIMINATOR_COLUMN_23_FEATURE_COUNT = OrmPackage.XML_BASE_DISCRIMINATOR_COLUMN_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Xml Structure 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_STRUCTURE_23_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3 <em>Xml Element Collection 23</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlElementCollection_2_3()
-	 * @generated
-	 */
-	public static final int XML_ELEMENT_COLLECTION_23 = 16;
-
-	/**
-	 * The feature id for the '<em><b>Composite Member</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_23__COMPOSITE_MEMBER = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Element Collection 23</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_23_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType <em>Multitenant Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getMultitenantType()
-	 * @generated
-	 */
-	public static final int MULTITENANT_TYPE = 17;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEmbeddable_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMultitenant_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedPlsqlStoredFunctionQuery_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedPlsqlStoredProcedureQuery_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlNamedStoredFunctionQuery_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntity_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclass_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntityMappings_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPersistenceUnitDefaults_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPlsqlRecord_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlPlsqlTable_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStruct_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlTenantDiscriminatorColumn_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlAttributes_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlStructure_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlArray_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlElementCollection_2_3EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum multitenantTypeEEnum = 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.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EclipseLinkOrmV2_3Package()
-	{
-		super(eNS_URI, EclipseLinkOrmV2_3Factory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link EclipseLinkOrmV2_3Package#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_3Package init()
-	{
-		if (isInited) return (EclipseLinkOrmV2_3Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI);
-
-		// Obtain or create and register package
-		EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV2_3Package());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
-		EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
-		EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
-		EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
-		EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) : EclipseLinkOrmV2_2Package.eINSTANCE);
-		EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI) : EclipseLinkOrmV2_4Package.eINSTANCE);
-
-		// Create package meta-data objects
-		theEclipseLinkOrmV2_3Package.createPackageContents();
-		theEclipseLinkOrmPackage.createPackageContents();
-		theEclipseLinkOrmV1_1Package.createPackageContents();
-		theEclipseLinkOrmV2_0Package.createPackageContents();
-		theEclipseLinkOrmV2_1Package.createPackageContents();
-		theEclipseLinkOrmV2_2Package.createPackageContents();
-		theEclipseLinkOrmV2_4Package.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLinkOrmV2_3Package.initializePackageContents();
-		theEclipseLinkOrmPackage.initializePackageContents();
-		theEclipseLinkOrmV1_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_0Package.initializePackageContents();
-		theEclipseLinkOrmV2_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_2Package.initializePackageContents();
-		theEclipseLinkOrmV2_4Package.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLinkOrmV2_3Package.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(EclipseLinkOrmV2_3Package.eNS_URI, theEclipseLinkOrmV2_3Package);
-		return theEclipseLinkOrmV2_3Package;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3 <em>Xml Embeddable 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Embeddable 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3
-	 * @generated
-	 */
-	public EClass getXmlEmbeddable_2_3()
-	{
-		return xmlEmbeddable_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getPlsqlRecords <em>Plsql Records</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Plsql Records</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getPlsqlRecords()
-	 * @see #getXmlEmbeddable_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEmbeddable_2_3_PlsqlRecords()
-	{
-		return (EReference)xmlEmbeddable_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getPlsqlTables <em>Plsql Tables</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Plsql Tables</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getPlsqlTables()
-	 * @see #getXmlEmbeddable_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEmbeddable_2_3_PlsqlTables()
-	{
-		return (EReference)xmlEmbeddable_2_3EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getStruct <em>Struct</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Struct</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getStruct()
-	 * @see #getXmlEmbeddable_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEmbeddable_2_3_Struct()
-	{
-		return (EReference)xmlEmbeddable_2_3EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3 <em>Xml Multitenant 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Multitenant 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3
-	 * @generated
-	 */
-	public EClass getXmlMultitenant_2_3()
-	{
-		return xmlMultitenant_2_3EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3#getType()
-	 * @see #getXmlMultitenant_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlMultitenant_2_3_Type()
-	{
-		return (EAttribute)xmlMultitenant_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tenant Discriminator Columns</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3#getTenantDiscriminatorColumns()
-	 * @see #getXmlMultitenant_2_3()
-	 * @generated
-	 */
-	public EReference getXmlMultitenant_2_3_TenantDiscriminatorColumns()
-	{
-		return (EReference)xmlMultitenant_2_3EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3 <em>Xml Named Plsql Stored Function Query 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Plsql Stored Function Query 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3
-	 * @generated
-	 */
-	public EClass getXmlNamedPlsqlStoredFunctionQuery_2_3()
-	{
-		return xmlNamedPlsqlStoredFunctionQuery_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3#getName()
-	 * @see #getXmlNamedPlsqlStoredFunctionQuery_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedPlsqlStoredFunctionQuery_2_3_Name()
-	{
-		return (EAttribute)xmlNamedPlsqlStoredFunctionQuery_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3 <em>Xml Named Plsql Stored Procedure Query 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Plsql Stored Procedure Query 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3
-	 * @generated
-	 */
-	public EClass getXmlNamedPlsqlStoredProcedureQuery_2_3()
-	{
-		return xmlNamedPlsqlStoredProcedureQuery_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3#getName()
-	 * @see #getXmlNamedPlsqlStoredProcedureQuery_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedPlsqlStoredProcedureQuery_2_3_Name()
-	{
-		return (EAttribute)xmlNamedPlsqlStoredProcedureQuery_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3 <em>Xml Named Stored Function Query 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Named Stored Function Query 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3
-	 * @generated
-	 */
-	public EClass getXmlNamedStoredFunctionQuery_2_3()
-	{
-		return xmlNamedStoredFunctionQuery_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3#getName()
-	 * @see #getXmlNamedStoredFunctionQuery_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlNamedStoredFunctionQuery_2_3_Name()
-	{
-		return (EAttribute)xmlNamedStoredFunctionQuery_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3 <em>Xml Entity 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3
-	 * @generated
-	 */
-	public EClass getXmlEntity_2_3()
-	{
-		return xmlEntity_2_3EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getMultitenant <em>Multitenant</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Multitenant</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getMultitenant()
-	 * @see #getXmlEntity_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_3_Multitenant()
-	{
-		return (EReference)xmlEntity_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedStoredFunctionQueries <em>Named Stored Function Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Stored Function Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedStoredFunctionQueries()
-	 * @see #getXmlEntity_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_3_NamedStoredFunctionQueries()
-	{
-		return (EReference)xmlEntity_2_3EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedPlsqlStoredFunctionQueries <em>Named Plsql Stored Function Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Plsql Stored Function Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedPlsqlStoredFunctionQueries()
-	 * @see #getXmlEntity_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_3_NamedPlsqlStoredFunctionQueries()
-	{
-		return (EReference)xmlEntity_2_3EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedPlsqlStoredProcedureQueries <em>Named Plsql Stored Procedure Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Plsql Stored Procedure Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedPlsqlStoredProcedureQueries()
-	 * @see #getXmlEntity_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_3_NamedPlsqlStoredProcedureQueries()
-	{
-		return (EReference)xmlEntity_2_3EClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getPlsqlRecords <em>Plsql Records</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Plsql Records</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getPlsqlRecords()
-	 * @see #getXmlEntity_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_3_PlsqlRecords()
-	{
-		return (EReference)xmlEntity_2_3EClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getPlsqlTables <em>Plsql Tables</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Plsql Tables</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getPlsqlTables()
-	 * @see #getXmlEntity_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_3_PlsqlTables()
-	{
-		return (EReference)xmlEntity_2_3EClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getStruct <em>Struct</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Struct</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getStruct()
-	 * @see #getXmlEntity_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_3_Struct()
-	{
-		return (EReference)xmlEntity_2_3EClass.getEStructuralFeatures().get(6);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3 <em>Xml Mapped Superclass 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mapped Superclass 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass_2_3()
-	{
-		return xmlMappedSuperclass_2_3EClass;
-	}
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getMultitenant <em>Multitenant</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Multitenant</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getMultitenant()
-	 * @see #getXmlMappedSuperclass_2_3()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_3_Multitenant()
-	{
-		return (EReference)xmlMappedSuperclass_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedStoredFunctionQueries <em>Named Stored Function Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Stored Function Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedStoredFunctionQueries()
-	 * @see #getXmlMappedSuperclass_2_3()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_3_NamedStoredFunctionQueries()
-	{
-		return (EReference)xmlMappedSuperclass_2_3EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedPlsqlStoredFunctionQueries <em>Named Plsql Stored Function Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Plsql Stored Function Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedPlsqlStoredFunctionQueries()
-	 * @see #getXmlMappedSuperclass_2_3()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_3_NamedPlsqlStoredFunctionQueries()
-	{
-		return (EReference)xmlMappedSuperclass_2_3EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedPlsqlStoredProcedureQueries <em>Named Plsql Stored Procedure Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Plsql Stored Procedure Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedPlsqlStoredProcedureQueries()
-	 * @see #getXmlMappedSuperclass_2_3()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_3_NamedPlsqlStoredProcedureQueries()
-	{
-		return (EReference)xmlMappedSuperclass_2_3EClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getPlsqlRecords <em>Plsql Records</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Plsql Records</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getPlsqlRecords()
-	 * @see #getXmlMappedSuperclass_2_3()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_3_PlsqlRecords()
-	{
-		return (EReference)xmlMappedSuperclass_2_3EClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getPlsqlTables <em>Plsql Tables</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Plsql Tables</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getPlsqlTables()
-	 * @see #getXmlMappedSuperclass_2_3()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_3_PlsqlTables()
-	{
-		return (EReference)xmlMappedSuperclass_2_3EClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3 <em>Xml Entity Mappings 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity Mappings 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3
-	 * @generated
-	 */
-	public EClass getXmlEntityMappings_2_3()
-	{
-		return xmlEntityMappings_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tenant Discriminator Columns</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns()
-	 * @see #getXmlEntityMappings_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_3_TenantDiscriminatorColumns()
-	{
-		return (EReference)xmlEntityMappings_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedStoredFunctionQueries <em>Named Stored Function Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Stored Function Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedStoredFunctionQueries()
-	 * @see #getXmlEntityMappings_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_3_NamedStoredFunctionQueries()
-	{
-		return (EReference)xmlEntityMappings_2_3EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredFunctionQueries <em>Named Plsql Stored Function Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Plsql Stored Function Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredFunctionQueries()
-	 * @see #getXmlEntityMappings_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries()
-	{
-		return (EReference)xmlEntityMappings_2_3EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredProcedureQueries <em>Named Plsql Stored Procedure Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Named Plsql Stored Procedure Queries</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredProcedureQueries()
-	 * @see #getXmlEntityMappings_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries()
-	{
-		return (EReference)xmlEntityMappings_2_3EClass.getEStructuralFeatures().get(3);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getPlsqlRecords <em>Plsql Records</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Plsql Records</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getPlsqlRecords()
-	 * @see #getXmlEntityMappings_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_3_PlsqlRecords()
-	{
-		return (EReference)xmlEntityMappings_2_3EClass.getEStructuralFeatures().get(4);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getPlsqlTables <em>Plsql Tables</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Plsql Tables</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getPlsqlTables()
-	 * @see #getXmlEntityMappings_2_3()
-	 * @generated
-	 */
-	public EReference getXmlEntityMappings_2_3_PlsqlTables()
-	{
-		return (EReference)xmlEntityMappings_2_3EClass.getEStructuralFeatures().get(5);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3 <em>Xml Persistence Unit Defaults 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Persistence Unit Defaults 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3
-	 * @generated
-	 */
-	public EClass getXmlPersistenceUnitDefaults_2_3()
-	{
-		return xmlPersistenceUnitDefaults_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tenant Discriminator Columns</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns()
-	 * @see #getXmlPersistenceUnitDefaults_2_3()
-	 * @generated
-	 */
-	public EReference getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns()
-	{
-		return (EReference)xmlPersistenceUnitDefaults_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3 <em>Xml Plsql Record 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Plsql Record 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3
-	 * @generated
-	 */
-	public EClass getXmlPlsqlRecord_2_3()
-	{
-		return xmlPlsqlRecord_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3#getName()
-	 * @see #getXmlPlsqlRecord_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlPlsqlRecord_2_3_Name()
-	{
-		return (EAttribute)xmlPlsqlRecord_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3 <em>Xml Plsql Table 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Plsql Table 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3
-	 * @generated
-	 */
-	public EClass getXmlPlsqlTable_2_3()
-	{
-		return xmlPlsqlTable_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3#getName()
-	 * @see #getXmlPlsqlTable_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlPlsqlTable_2_3_Name()
-	{
-		return (EAttribute)xmlPlsqlTable_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3 <em>Xml Struct 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Struct 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3
-	 * @generated
-	 */
-	public EClass getXmlStruct_2_3()
-	{
-		return xmlStruct_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3#getName()
-	 * @see #getXmlStruct_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlStruct_2_3_Name()
-	{
-		return (EAttribute)xmlStruct_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Tenant Discriminator Column 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3
-	 * @generated
-	 */
-	public EClass getXmlTenantDiscriminatorColumn_2_3()
-	{
-		return xmlTenantDiscriminatorColumn_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getContextProperty <em>Context Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Context Property</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getContextProperty()
-	 * @see #getXmlTenantDiscriminatorColumn_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlTenantDiscriminatorColumn_2_3_ContextProperty()
-	{
-		return (EAttribute)xmlTenantDiscriminatorColumn_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getTable <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Table</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getTable()
-	 * @see #getXmlTenantDiscriminatorColumn_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlTenantDiscriminatorColumn_2_3_Table()
-	{
-		return (EAttribute)xmlTenantDiscriminatorColumn_2_3EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getPrimaryKey <em>Primary Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Primary Key</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getPrimaryKey()
-	 * @see #getXmlTenantDiscriminatorColumn_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlTenantDiscriminatorColumn_2_3_PrimaryKey()
-	{
-		return (EAttribute)xmlTenantDiscriminatorColumn_2_3EClass.getEStructuralFeatures().get(2);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 <em>Xml Attributes 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Attributes 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3
-	 * @generated
-	 */
-	public EClass getXmlAttributes_2_3()
-	{
-		return xmlAttributes_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3#getStructures <em>Structures</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Structures</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3#getStructures()
-	 * @see #getXmlAttributes_2_3()
-	 * @generated
-	 */
-	public EReference getXmlAttributes_2_3_Structures()
-	{
-		return (EReference)xmlAttributes_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3#getArrays <em>Arrays</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Arrays</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3#getArrays()
-	 * @see #getXmlAttributes_2_3()
-	 * @generated
-	 */
-	public EReference getXmlAttributes_2_3_Arrays()
-	{
-		return (EReference)xmlAttributes_2_3EClass.getEStructuralFeatures().get(1);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3 <em>Xml Structure 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Structure 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3
-	 * @generated
-	 */
-	public EClass getXmlStructure_2_3()
-	{
-		return xmlStructure_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3 <em>Xml Array 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Array 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3
-	 * @generated
-	 */
-	public EClass getXmlArray_2_3()
-	{
-		return xmlArray_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3 <em>Xml Element Collection 23</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Element Collection 23</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3
-	 * @generated
-	 */
-	public EClass getXmlElementCollection_2_3()
-	{
-		return xmlElementCollection_2_3EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3#getCompositeMember <em>Composite Member</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Composite Member</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3#getCompositeMember()
-	 * @see #getXmlElementCollection_2_3()
-	 * @generated
-	 */
-	public EAttribute getXmlElementCollection_2_3_CompositeMember()
-	{
-		return (EAttribute)xmlElementCollection_2_3EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType <em>Multitenant Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Multitenant Type</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType
-	 * @generated
-	 */
-	public EEnum getMultitenantType()
-	{
-		return multitenantTypeEEnum;
-	}
-
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_3Factory getEclipseLinkOrmV2_3Factory()
-	{
-		return (EclipseLinkOrmV2_3Factory)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
-		xmlArray_2_3EClass = createEClass(XML_ARRAY_23);
-
-		xmlAttributes_2_3EClass = createEClass(XML_ATTRIBUTES_23);
-		createEReference(xmlAttributes_2_3EClass, XML_ATTRIBUTES_23__STRUCTURES);
-		createEReference(xmlAttributes_2_3EClass, XML_ATTRIBUTES_23__ARRAYS);
-
-		xmlEmbeddable_2_3EClass = createEClass(XML_EMBEDDABLE_23);
-		createEReference(xmlEmbeddable_2_3EClass, XML_EMBEDDABLE_23__PLSQL_RECORDS);
-		createEReference(xmlEmbeddable_2_3EClass, XML_EMBEDDABLE_23__PLSQL_TABLES);
-		createEReference(xmlEmbeddable_2_3EClass, XML_EMBEDDABLE_23__STRUCT);
-
-		xmlEntity_2_3EClass = createEClass(XML_ENTITY_23);
-		createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__MULTITENANT);
-		createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__NAMED_STORED_FUNCTION_QUERIES);
-		createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
-		createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
-		createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__PLSQL_RECORDS);
-		createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__PLSQL_TABLES);
-		createEReference(xmlEntity_2_3EClass, XML_ENTITY_23__STRUCT);
-
-		xmlEntityMappings_2_3EClass = createEClass(XML_ENTITY_MAPPINGS_23);
-		createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS);
-		createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES);
-		createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
-		createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
-		createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__PLSQL_RECORDS);
-		createEReference(xmlEntityMappings_2_3EClass, XML_ENTITY_MAPPINGS_23__PLSQL_TABLES);
-
-		xmlMappedSuperclass_2_3EClass = createEClass(XML_MAPPED_SUPERCLASS_23);
-		createEReference(xmlMappedSuperclass_2_3EClass, XML_MAPPED_SUPERCLASS_23__MULTITENANT);
-		createEReference(xmlMappedSuperclass_2_3EClass, XML_MAPPED_SUPERCLASS_23__NAMED_STORED_FUNCTION_QUERIES);
-		createEReference(xmlMappedSuperclass_2_3EClass, XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES);
-		createEReference(xmlMappedSuperclass_2_3EClass, XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES);
-		createEReference(xmlMappedSuperclass_2_3EClass, XML_MAPPED_SUPERCLASS_23__PLSQL_RECORDS);
-		createEReference(xmlMappedSuperclass_2_3EClass, XML_MAPPED_SUPERCLASS_23__PLSQL_TABLES);
-
-		xmlMultitenant_2_3EClass = createEClass(XML_MULTITENANT_23);
-		createEAttribute(xmlMultitenant_2_3EClass, XML_MULTITENANT_23__TYPE);
-		createEReference(xmlMultitenant_2_3EClass, XML_MULTITENANT_23__TENANT_DISCRIMINATOR_COLUMNS);
-
-		xmlNamedPlsqlStoredFunctionQuery_2_3EClass = createEClass(XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23);
-		createEAttribute(xmlNamedPlsqlStoredFunctionQuery_2_3EClass, XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23__NAME);
-
-		xmlNamedPlsqlStoredProcedureQuery_2_3EClass = createEClass(XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23);
-		createEAttribute(xmlNamedPlsqlStoredProcedureQuery_2_3EClass, XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23__NAME);
-
-		xmlNamedStoredFunctionQuery_2_3EClass = createEClass(XML_NAMED_STORED_FUNCTION_QUERY_23);
-		createEAttribute(xmlNamedStoredFunctionQuery_2_3EClass, XML_NAMED_STORED_FUNCTION_QUERY_23__NAME);
-
-		xmlPersistenceUnitDefaults_2_3EClass = createEClass(XML_PERSISTENCE_UNIT_DEFAULTS_23);
-		createEReference(xmlPersistenceUnitDefaults_2_3EClass, XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS);
-
-		xmlPlsqlRecord_2_3EClass = createEClass(XML_PLSQL_RECORD_23);
-		createEAttribute(xmlPlsqlRecord_2_3EClass, XML_PLSQL_RECORD_23__NAME);
-
-		xmlPlsqlTable_2_3EClass = createEClass(XML_PLSQL_TABLE_23);
-		createEAttribute(xmlPlsqlTable_2_3EClass, XML_PLSQL_TABLE_23__NAME);
-
-		xmlStruct_2_3EClass = createEClass(XML_STRUCT_23);
-		createEAttribute(xmlStruct_2_3EClass, XML_STRUCT_23__NAME);
-
-		xmlTenantDiscriminatorColumn_2_3EClass = createEClass(XML_TENANT_DISCRIMINATOR_COLUMN_23);
-		createEAttribute(xmlTenantDiscriminatorColumn_2_3EClass, XML_TENANT_DISCRIMINATOR_COLUMN_23__CONTEXT_PROPERTY);
-		createEAttribute(xmlTenantDiscriminatorColumn_2_3EClass, XML_TENANT_DISCRIMINATOR_COLUMN_23__TABLE);
-		createEAttribute(xmlTenantDiscriminatorColumn_2_3EClass, XML_TENANT_DISCRIMINATOR_COLUMN_23__PRIMARY_KEY);
-
-		xmlStructure_2_3EClass = createEClass(XML_STRUCTURE_23);
-
-		xmlElementCollection_2_3EClass = createEClass(XML_ELEMENT_COLLECTION_23);
-		createEAttribute(xmlElementCollection_2_3EClass, XML_ELEMENT_COLLECTION_23__COMPOSITE_MEMBER);
-
-		// Create enums
-		multitenantTypeEEnum = createEEnum(MULTITENANT_TYPE);
-	}
-
-	/**
-	 * <!-- 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
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI);
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-		OrmPackage theOrmPackage = (OrmPackage)EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		xmlTenantDiscriminatorColumn_2_3EClass.getESuperTypes().add(theOrmPackage.getXmlBaseDiscriminatorColumn());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlArray_2_3EClass, XmlArray_2_3.class, "XmlArray_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlAttributes_2_3EClass, XmlAttributes_2_3.class, "XmlAttributes_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlAttributes_2_3_Structures(), this.getXmlStructure_2_3(), null, "structures", null, 0, -1, XmlAttributes_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlAttributes_2_3_Arrays(), this.getXmlArray_2_3(), null, "arrays", null, 0, -1, XmlAttributes_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEmbeddable_2_3EClass, XmlEmbeddable_2_3.class, "XmlEmbeddable_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEmbeddable_2_3_PlsqlRecords(), this.getXmlPlsqlRecord_2_3(), null, "plsqlRecords", null, 0, -1, XmlEmbeddable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEmbeddable_2_3_PlsqlTables(), theEclipseLinkOrmPackage.getXmlPlsqlTable(), null, "plsqlTables", null, 0, -1, XmlEmbeddable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEmbeddable_2_3_Struct(), this.getXmlStruct_2_3(), null, "struct", null, 0, 1, XmlEmbeddable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntity_2_3EClass, XmlEntity_2_3.class, "XmlEntity_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntity_2_3_Multitenant(), this.getXmlMultitenant_2_3(), null, "multitenant", null, 0, 1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_2_3_NamedStoredFunctionQueries(), this.getXmlNamedStoredFunctionQuery_2_3(), null, "namedStoredFunctionQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_2_3_NamedPlsqlStoredFunctionQueries(), this.getXmlNamedPlsqlStoredFunctionQuery_2_3(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_2_3_NamedPlsqlStoredProcedureQueries(), this.getXmlNamedPlsqlStoredProcedureQuery_2_3(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_2_3_PlsqlRecords(), this.getXmlPlsqlRecord_2_3(), null, "plsqlRecords", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_2_3_PlsqlTables(), theEclipseLinkOrmPackage.getXmlPlsqlTable(), null, "plsqlTables", null, 0, -1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntity_2_3_Struct(), this.getXmlStruct_2_3(), null, "struct", null, 0, 1, XmlEntity_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntityMappings_2_3EClass, XmlEntityMappings_2_3.class, "XmlEntityMappings_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntityMappings_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_3_NamedStoredFunctionQueries(), this.getXmlNamedStoredFunctionQuery_2_3(), null, "namedStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries(), this.getXmlNamedPlsqlStoredFunctionQuery_2_3(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries(), this.getXmlNamedPlsqlStoredProcedureQuery_2_3(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_3_PlsqlRecords(), this.getXmlPlsqlRecord_2_3(), null, "plsqlRecords", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlEntityMappings_2_3_PlsqlTables(), theEclipseLinkOrmPackage.getXmlPlsqlTable(), null, "plsqlTables", null, 0, -1, XmlEntityMappings_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMappedSuperclass_2_3EClass, XmlMappedSuperclass_2_3.class, "XmlMappedSuperclass_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMappedSuperclass_2_3_Multitenant(), this.getXmlMultitenant_2_3(), null, "multitenant", null, 0, 1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_2_3_NamedStoredFunctionQueries(), this.getXmlNamedStoredFunctionQuery_2_3(), null, "namedStoredFunctionQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_2_3_NamedPlsqlStoredFunctionQueries(), this.getXmlNamedPlsqlStoredFunctionQuery_2_3(), null, "namedPlsqlStoredFunctionQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_2_3_NamedPlsqlStoredProcedureQueries(), this.getXmlNamedPlsqlStoredProcedureQuery_2_3(), null, "namedPlsqlStoredProcedureQueries", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_2_3_PlsqlRecords(), this.getXmlPlsqlRecord_2_3(), null, "plsqlRecords", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMappedSuperclass_2_3_PlsqlTables(), theEclipseLinkOrmPackage.getXmlPlsqlTable(), null, "plsqlTables", null, 0, -1, XmlMappedSuperclass_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMultitenant_2_3EClass, XmlMultitenant_2_3.class, "XmlMultitenant_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlMultitenant_2_3_Type(), this.getMultitenantType(), "type", null, 0, 1, XmlMultitenant_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXmlMultitenant_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlMultitenant_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlNamedPlsqlStoredFunctionQuery_2_3EClass, XmlNamedPlsqlStoredFunctionQuery_2_3.class, "XmlNamedPlsqlStoredFunctionQuery_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlNamedPlsqlStoredFunctionQuery_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedPlsqlStoredFunctionQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlNamedPlsqlStoredProcedureQuery_2_3EClass, XmlNamedPlsqlStoredProcedureQuery_2_3.class, "XmlNamedPlsqlStoredProcedureQuery_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlNamedPlsqlStoredProcedureQuery_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedPlsqlStoredProcedureQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlNamedStoredFunctionQuery_2_3EClass, XmlNamedStoredFunctionQuery_2_3.class, "XmlNamedStoredFunctionQuery_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlNamedStoredFunctionQuery_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedStoredFunctionQuery_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPersistenceUnitDefaults_2_3EClass, XmlPersistenceUnitDefaults_2_3.class, "XmlPersistenceUnitDefaults_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns(), this.getXmlTenantDiscriminatorColumn_2_3(), null, "tenantDiscriminatorColumns", null, 0, -1, XmlPersistenceUnitDefaults_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPlsqlRecord_2_3EClass, XmlPlsqlRecord_2_3.class, "XmlPlsqlRecord_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPlsqlRecord_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPlsqlRecord_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlPlsqlTable_2_3EClass, XmlPlsqlTable_2_3.class, "XmlPlsqlTable_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlPlsqlTable_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlPlsqlTable_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlStruct_2_3EClass, XmlStruct_2_3.class, "XmlStruct_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlStruct_2_3_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlStruct_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlTenantDiscriminatorColumn_2_3EClass, XmlTenantDiscriminatorColumn_2_3.class, "XmlTenantDiscriminatorColumn_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlTenantDiscriminatorColumn_2_3_ContextProperty(), theXMLTypePackage.getString(), "contextProperty", null, 0, 1, XmlTenantDiscriminatorColumn_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTenantDiscriminatorColumn_2_3_Table(), theXMLTypePackage.getString(), "table", null, 0, 1, XmlTenantDiscriminatorColumn_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getXmlTenantDiscriminatorColumn_2_3_PrimaryKey(), ecorePackage.getEBooleanObject(), "primaryKey", null, 0, 1, XmlTenantDiscriminatorColumn_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlStructure_2_3EClass, XmlStructure_2_3.class, "XmlStructure_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xmlElementCollection_2_3EClass, XmlElementCollection_2_3.class, "XmlElementCollection_2_3", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlElementCollection_2_3_CompositeMember(), theXMLTypePackage.getString(), "compositeMember", null, 0, 1, XmlElementCollection_2_3.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(multitenantTypeEEnum, MultitenantType.class, "MultitenantType");
-		addEEnumLiteral(multitenantTypeEEnum, MultitenantType.SINGLE_TABLE);
-		addEEnumLiteral(multitenantTypeEEnum, MultitenantType.TABLE_PER_TENANT);
-	}
-
-	/**
-	 * <!-- 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.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3 <em>Xml Embeddable 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEmbeddable_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_EMBEDDABLE_23 = eINSTANCE.getXmlEmbeddable_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Plsql Records</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_EMBEDDABLE_23__PLSQL_RECORDS = eINSTANCE.getXmlEmbeddable_2_3_PlsqlRecords();
-
-		/**
-		 * The meta object literal for the '<em><b>Plsql Tables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_EMBEDDABLE_23__PLSQL_TABLES = eINSTANCE.getXmlEmbeddable_2_3_PlsqlTables();
-
-		/**
-		 * The meta object literal for the '<em><b>Struct</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_EMBEDDABLE_23__STRUCT = eINSTANCE.getXmlEmbeddable_2_3_Struct();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3 <em>Xml Multitenant 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMultitenant_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_MULTITENANT_23 = eINSTANCE.getXmlMultitenant_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MULTITENANT_23__TYPE = eINSTANCE.getXmlMultitenant_2_3_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MULTITENANT_23__TENANT_DISCRIMINATOR_COLUMNS = eINSTANCE.getXmlMultitenant_2_3_TenantDiscriminatorColumns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3 <em>Xml Named Plsql Stored Function Query 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredFunctionQuery_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23 = eINSTANCE.getXmlNamedPlsqlStoredFunctionQuery_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_PLSQL_STORED_FUNCTION_QUERY_23__NAME = eINSTANCE.getXmlNamedPlsqlStoredFunctionQuery_2_3_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3 <em>Xml Named Plsql Stored Procedure Query 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredProcedureQuery_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23 = eINSTANCE.getXmlNamedPlsqlStoredProcedureQuery_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_PLSQL_STORED_PROCEDURE_QUERY_23__NAME = eINSTANCE.getXmlNamedPlsqlStoredProcedureQuery_2_3_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3 <em>Xml Named Stored Function Query 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredFunctionQuery_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_NAMED_STORED_FUNCTION_QUERY_23 = eINSTANCE.getXmlNamedStoredFunctionQuery_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_NAMED_STORED_FUNCTION_QUERY_23__NAME = eINSTANCE.getXmlNamedStoredFunctionQuery_2_3_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3 <em>Xml Entity 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_23 = eINSTANCE.getXmlEntity_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Multitenant</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_23__MULTITENANT = eINSTANCE.getXmlEntity_2_3_Multitenant();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Stored Function Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_23__NAMED_STORED_FUNCTION_QUERIES = eINSTANCE.getXmlEntity_2_3_NamedStoredFunctionQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES = eINSTANCE.getXmlEntity_2_3_NamedPlsqlStoredFunctionQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = eINSTANCE.getXmlEntity_2_3_NamedPlsqlStoredProcedureQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Plsql Records</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_23__PLSQL_RECORDS = eINSTANCE.getXmlEntity_2_3_PlsqlRecords();
-
-		/**
-		 * The meta object literal for the '<em><b>Plsql Tables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_23__PLSQL_TABLES = eINSTANCE.getXmlEntity_2_3_PlsqlTables();
-
-		/**
-		 * The meta object literal for the '<em><b>Struct</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_23__STRUCT = eINSTANCE.getXmlEntity_2_3_Struct();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3 <em>Xml Mapped Superclass 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPED_SUPERCLASS_23 = eINSTANCE.getXmlMappedSuperclass_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Multitenant</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_23__MULTITENANT = eINSTANCE.getXmlMappedSuperclass_2_3_Multitenant();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Stored Function Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_23__NAMED_STORED_FUNCTION_QUERIES = eINSTANCE.getXmlMappedSuperclass_2_3_NamedStoredFunctionQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES = eINSTANCE.getXmlMappedSuperclass_2_3_NamedPlsqlStoredFunctionQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = eINSTANCE.getXmlMappedSuperclass_2_3_NamedPlsqlStoredProcedureQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Plsql Records</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_23__PLSQL_RECORDS = eINSTANCE.getXmlMappedSuperclass_2_3_PlsqlRecords();
-
-		/**
-		 * The meta object literal for the '<em><b>Plsql Tables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_23__PLSQL_TABLES = eINSTANCE.getXmlMappedSuperclass_2_3_PlsqlTables();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3 <em>Xml Entity Mappings 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_MAPPINGS_23 = eINSTANCE.getXmlEntityMappings_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_23__TENANT_DISCRIMINATOR_COLUMNS = eINSTANCE.getXmlEntityMappings_2_3_TenantDiscriminatorColumns();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Stored Function Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_23__NAMED_STORED_FUNCTION_QUERIES = eINSTANCE.getXmlEntityMappings_2_3_NamedStoredFunctionQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_FUNCTION_QUERIES = eINSTANCE.getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_23__NAMED_PLSQL_STORED_PROCEDURE_QUERIES = eINSTANCE.getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries();
-
-		/**
-		 * The meta object literal for the '<em><b>Plsql Records</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_23__PLSQL_RECORDS = eINSTANCE.getXmlEntityMappings_2_3_PlsqlRecords();
-
-		/**
-		 * The meta object literal for the '<em><b>Plsql Tables</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_MAPPINGS_23__PLSQL_TABLES = eINSTANCE.getXmlEntityMappings_2_3_PlsqlTables();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3 <em>Xml Persistence Unit Defaults 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS_23 = eINSTANCE.getXmlPersistenceUnitDefaults_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_PERSISTENCE_UNIT_DEFAULTS_23__TENANT_DISCRIMINATOR_COLUMNS = eINSTANCE.getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3 <em>Xml Plsql Record 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlRecord_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_PLSQL_RECORD_23 = eINSTANCE.getXmlPlsqlRecord_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PLSQL_RECORD_23__NAME = eINSTANCE.getXmlPlsqlRecord_2_3_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3 <em>Xml Plsql Table 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlTable_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_PLSQL_TABLE_23 = eINSTANCE.getXmlPlsqlTable_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_PLSQL_TABLE_23__NAME = eINSTANCE.getXmlPlsqlTable_2_3_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3 <em>Xml Struct 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStruct_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_STRUCT_23 = eINSTANCE.getXmlStruct_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_STRUCT_23__NAME = eINSTANCE.getXmlStruct_2_3_Name();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3 <em>Xml Tenant Discriminator Column 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_TENANT_DISCRIMINATOR_COLUMN_23 = eINSTANCE.getXmlTenantDiscriminatorColumn_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Context Property</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TENANT_DISCRIMINATOR_COLUMN_23__CONTEXT_PROPERTY = eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_ContextProperty();
-
-		/**
-		 * The meta object literal for the '<em><b>Table</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TENANT_DISCRIMINATOR_COLUMN_23__TABLE = eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_Table();
-
-		/**
-		 * The meta object literal for the '<em><b>Primary Key</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_TENANT_DISCRIMINATOR_COLUMN_23__PRIMARY_KEY = eINSTANCE.getXmlTenantDiscriminatorColumn_2_3_PrimaryKey();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3 <em>Xml Attributes 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlAttributes_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_ATTRIBUTES_23 = eINSTANCE.getXmlAttributes_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Structures</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ATTRIBUTES_23__STRUCTURES = eINSTANCE.getXmlAttributes_2_3_Structures();
-
-		/**
-		 * The meta object literal for the '<em><b>Arrays</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ATTRIBUTES_23__ARRAYS = eINSTANCE.getXmlAttributes_2_3_Arrays();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3 <em>Xml Structure 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStructure_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_STRUCTURE_23 = eINSTANCE.getXmlStructure_2_3();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3 <em>Xml Array 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlArray_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_ARRAY_23 = eINSTANCE.getXmlArray_2_3();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3 <em>Xml Element Collection 23</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlElementCollection_2_3()
-		 * @generated
-		 */
-		public static final EClass XML_ELEMENT_COLLECTION_23 = eINSTANCE.getXmlElementCollection_2_3();
-
-		/**
-		 * The meta object literal for the '<em><b>Composite Member</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ELEMENT_COLLECTION_23__COMPOSITE_MEMBER = eINSTANCE.getXmlElementCollection_2_3_CompositeMember();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType <em>Multitenant Type</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getMultitenantType()
-		 * @generated
-		 */
-		public static final EEnum MULTITENANT_TYPE = eINSTANCE.getMultitenantType();
-
-	}
-
-} //EclipseLinkOrmV2_3Package
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
deleted file mode 100644
index 2276439c01..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/MultitenantType.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Multitenant Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getMultitenantType()
- * @model
- * @generated
- */
-public enum MultitenantType implements Enumerator
-{
-	/**
-	 * The '<em><b>SINGLE TABLE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SINGLE_TABLE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SINGLE_TABLE(0, "SINGLE_TABLE", "SINGLE_TABLE"),
-
-	/**
-	 * The '<em><b>TABLE PER TENANT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TABLE_PER_TENANT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TABLE_PER_TENANT(1, "TABLE_PER_TENANT", "TABLE_PER_TENANT");
-
-	/**
-	 * The '<em><b>SINGLE TABLE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SINGLE TABLE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SINGLE_TABLE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SINGLE_TABLE_VALUE = 0;
-
-	/**
-	 * The '<em><b>TABLE PER TENANT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TABLE PER TENANT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TABLE_PER_TENANT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TABLE_PER_TENANT_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Multitenant Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MultitenantType[] VALUES_ARRAY =
-		new MultitenantType[]
-		{
-			SINGLE_TABLE,
-			TABLE_PER_TENANT,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Multitenant Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<MultitenantType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Multitenant Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultitenantType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			MultitenantType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Multitenant Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultitenantType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			MultitenantType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Multitenant Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultitenantType get(int value)
-	{
-		switch (value)
-		{
-			case SINGLE_TABLE_VALUE: return SINGLE_TABLE;
-			case TABLE_PER_TENANT_VALUE: return TABLE_PER_TENANT;
-		}
-		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 MultitenantType(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;
-	}
-	
-} //XmlMultitenantType
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlArray_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlArray_2_3.java
deleted file mode 100644
index 0640d17f38..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlArray_2_3.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Array 23</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlArray_2_3()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlArray_2_3 extends JpaEObject
-{
-} // XmlArray_2_3
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
deleted file mode 100644
index 91905162a2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlAttributes_2_3.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Attributes 23</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3#getStructures <em>Structures</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlAttributes_2_3#getArrays <em>Arrays</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlAttributes_2_3 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Structures</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStructure_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Structures</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>Structures</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlAttributes_2_3_Structures()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlStructure_2_3> getStructures();
-
-	/**
-	 * Returns the value of the '<em><b>Arrays</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlArray_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Arrays</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>Arrays</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlAttributes_2_3_Arrays()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlArray_2_3> getArrays();
-
-} // XmlAttributes_2_3
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
deleted file mode 100644
index f098a869f3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlElementCollection_2_3.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: XmlElementCollection_2_3.java,v 1.1 2011/06/24 15:49:56 kmoore Exp $
- */
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Element Collection 23</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3#getCompositeMember <em>Composite Member</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlElementCollection_2_3 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Composite Member</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Composite Member</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Composite Member</em>' attribute.
-	 * @see #setCompositeMember(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlElementCollection_2_3_CompositeMember()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getCompositeMember();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlElementCollection_2_3#getCompositeMember <em>Composite Member</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Composite Member</em>' attribute.
-	 * @see #getCompositeMember()
-	 * @generated
-	 */
-	void setCompositeMember(String value);
-
-} // XmlElementCollection_2_3
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
deleted file mode 100644
index 51e4eb93a9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEmbeddable_2_3.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Embeddable 23</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getPlsqlRecords <em>Plsql Records</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getPlsqlTables <em>Plsql Tables</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getStruct <em>Struct</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlEmbeddable_2_3 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Records</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>Plsql Records</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEmbeddable_2_3_PlsqlRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPlsqlRecord_2_3> getPlsqlRecords();
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Tables</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>Plsql Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEmbeddable_2_3_PlsqlTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPlsqlTable> getPlsqlTables();
-
-	/**
-	 * Returns the value of the '<em><b>Struct</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct</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>Struct</em>' containment reference.
-	 * @see #setStruct(XmlStruct_2_3)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEmbeddable_2_3_Struct()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlStruct_2_3 getStruct();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEmbeddable_2_3#getStruct <em>Struct</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct</em>' containment reference.
-	 * @see #getStruct()
-	 * @generated
-	 */
-	void setStruct(XmlStruct_2_3 value);
-
-} // XmlEmbeddable_2_3
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
deleted file mode 100644
index 9c1ddf28bd..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntityMappings_2_3.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity Mappings 23</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedStoredFunctionQueries <em>Named Stored Function Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredFunctionQueries <em>Named Plsql Stored Function Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getNamedPlsqlStoredProcedureQueries <em>Named Plsql Stored Procedure Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getPlsqlRecords <em>Plsql Records</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntityMappings_2_3#getPlsqlTables <em>Plsql Tables</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlEntityMappings_2_3 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_TenantDiscriminatorColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns();
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_NamedStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_NamedPlsqlStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_NamedPlsqlStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Records</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>Plsql Records</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_PlsqlRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPlsqlRecord_2_3> getPlsqlRecords();
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Tables</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>Plsql Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntityMappings_2_3_PlsqlTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPlsqlTable> getPlsqlTables();
-
-} // XmlEntityMappings_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntity_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntity_2_3.java
deleted file mode 100644
index 8235151c67..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlEntity_2_3.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity 23</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getMultitenant <em>Multitenant</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedStoredFunctionQueries <em>Named Stored Function Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedPlsqlStoredFunctionQueries <em>Named Plsql Stored Function Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getNamedPlsqlStoredProcedureQueries <em>Named Plsql Stored Procedure Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getPlsqlRecords <em>Plsql Records</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getPlsqlTables <em>Plsql Tables</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getStruct <em>Struct</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlEntity_2_3 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Multitenant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multitenant</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>Multitenant</em>' containment reference.
-	 * @see #setMultitenant(XmlMultitenant_2_3)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3_Multitenant()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlMultitenant_2_3 getMultitenant();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getMultitenant <em>Multitenant</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multitenant</em>' containment reference.
-	 * @see #getMultitenant()
-	 * @generated
-	 */
-	void setMultitenant(XmlMultitenant_2_3 value);
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3_NamedStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3_NamedPlsqlStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3_NamedPlsqlStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Records</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>Plsql Records</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3_PlsqlRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPlsqlRecord_2_3> getPlsqlRecords();
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Tables</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>Plsql Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3_PlsqlTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPlsqlTable> getPlsqlTables();
-
-	/**
-	 * Returns the value of the '<em><b>Struct</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Struct</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>Struct</em>' containment reference.
-	 * @see #setStruct(XmlStruct_2_3)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlEntity_2_3_Struct()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlStruct_2_3 getStruct();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlEntity_2_3#getStruct <em>Struct</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Struct</em>' containment reference.
-	 * @see #getStruct()
-	 * @generated
-	 */
-	void setStruct(XmlStruct_2_3 value);
-
-} // XmlEntity_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMappedSuperclass_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMappedSuperclass_2_3.java
deleted file mode 100644
index 4dd62a9690..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMappedSuperclass_2_3.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.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.jpa.eclipselink.core.resource.orm.XmlPlsqlTable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Mapped Superclass 23</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getMultitenant <em>Multitenant</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedStoredFunctionQueries <em>Named Stored Function Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedPlsqlStoredFunctionQueries <em>Named Plsql Stored Function Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getNamedPlsqlStoredProcedureQueries <em>Named Plsql Stored Procedure Queries</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getPlsqlRecords <em>Plsql Records</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getPlsqlTables <em>Plsql Tables</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlMappedSuperclass_2_3 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Multitenant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multitenant</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>Multitenant</em>' containment reference.
-	 * @see #setMultitenant(XmlMultitenant_2_3)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3_Multitenant()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlMultitenant_2_3 getMultitenant();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMappedSuperclass_2_3#getMultitenant <em>Multitenant</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multitenant</em>' containment reference.
-	 * @see #getMultitenant()
-	 * @generated
-	 */
-	void setMultitenant(XmlMultitenant_2_3 value);
-
-	/**
-	 * Returns the value of the '<em><b>Named Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3_NamedStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedStoredFunctionQuery_2_3> getNamedStoredFunctionQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Function Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Function Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Function Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3_NamedPlsqlStoredFunctionQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedPlsqlStoredFunctionQuery_2_3> getNamedPlsqlStoredFunctionQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Named Plsql Stored Procedure Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Named Plsql Stored Procedure Queries</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3_NamedPlsqlStoredProcedureQueries()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlNamedPlsqlStoredProcedureQuery_2_3> getNamedPlsqlStoredProcedureQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Records</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Records</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>Plsql Records</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3_PlsqlRecords()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPlsqlRecord_2_3> getPlsqlRecords();
-
-	/**
-	 * Returns the value of the '<em><b>Plsql Tables</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlPlsqlTable}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plsql Tables</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>Plsql Tables</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMappedSuperclass_2_3_PlsqlTables()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlPlsqlTable> getPlsqlTables();
-
-} // XmlMappedSuperclass_2_3
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
deleted file mode 100644
index 907e1e1000..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlMultitenant_2_3.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Multitenant 23</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlMultitenant_2_3 extends JpaEObject
-{
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType}.
-	 * <!-- 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 org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType
-	 * @see #setType(MultitenantType)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMultitenant_2_3_Type()
-	 * @model
-	 * @generated
-	 */
-	MultitenantType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlMultitenant_2_3#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.MultitenantType
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(MultitenantType value);
-
-	/**
-	 * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlMultitenant_2_3_TenantDiscriminatorColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns();
-} // XmlMultitenant_2_3
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
deleted file mode 100644
index 6cd2cf408d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredFunctionQuery_2_3.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Named Plsql Stored Function Query2 3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlNamedPlsqlStoredFunctionQuery_2_3 extends JpaEObject
-{
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredFunctionQuery_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredFunctionQuery_2_3#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-} // XmlNamedPlsqlStoredFunctionQuery2_3
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
deleted file mode 100644
index f4ffe08590..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedPlsqlStoredProcedureQuery_2_3.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Named Plsql Stored Procedure Query2 3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlNamedPlsqlStoredProcedureQuery_2_3 extends JpaEObject
-{
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedPlsqlStoredProcedureQuery_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedPlsqlStoredProcedureQuery_2_3#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-} // XmlNamedPlsqlStoredProcedureQuery2_3
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
deleted file mode 100644
index 6d5b9b62d0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlNamedStoredFunctionQuery_2_3.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Named Stored Function Query2 3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlNamedStoredFunctionQuery_2_3 extends JpaEObject
-{
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlNamedStoredFunctionQuery_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlNamedStoredFunctionQuery_2_3#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-} // XmlNamedStoredFunctionQuery2_3
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
deleted file mode 100644
index e63726e7f6..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPersistenceUnitDefaults_2_3.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Persistence Unit Defaults 23</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPersistenceUnitDefaults_2_3#getTenantDiscriminatorColumns <em>Tenant Discriminator Columns</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlPersistenceUnitDefaults_2_3 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Tenant Discriminator Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tenant Discriminator Columns</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tenant Discriminator Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPersistenceUnitDefaults_2_3_TenantDiscriminatorColumns()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<XmlTenantDiscriminatorColumn_2_3> getTenantDiscriminatorColumns();
-
-} // XmlPersistenceUnitDefaults_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/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
deleted file mode 100644
index 19892e1459..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlRecord_2_3.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Plsql Record2 3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlPlsqlRecord_2_3 extends JpaEObject
-{
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlRecord_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlRecord_2_3#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-} // XmlPlsqlRecord2_3
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
deleted file mode 100644
index 254d000c31..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlPlsqlTable_2_3.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Plsql Table2 3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlPlsqlTable_2_3 extends JpaEObject
-{
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlPlsqlTable_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlPlsqlTable_2_3#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-} // XmlPlsqlTable2_3
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
deleted file mode 100644
index 9cd71de2f8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStruct_2_3.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Struct2 3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlStruct_2_3 extends JpaEObject
-{
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlStruct_2_3_Name()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlStruct_2_3#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-} // XmlStruct2_3
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
deleted file mode 100644
index 26b6dc2e79..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlStructure_2_3.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Structure 23</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @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
- * @generated
- */
-public interface XmlStructure_2_3 extends JpaEObject
-{
-} // XmlStructure_2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java
deleted file mode 100644
index cf09a4064e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_3/XmlTenantDiscriminatorColumn_2_3.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3;
-
-import org.eclipse.jpt.jpa.core.resource.orm.XmlBaseDiscriminatorColumn;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Tenant Discriminator2 3</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getContextProperty <em>Context Property</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getTable <em>Table</em>}</li>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getPrimaryKey <em>Primary Key</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3()
- * @model kind="class" interface="true" abstract="true"
- * @generated
- */
-public interface XmlTenantDiscriminatorColumn_2_3 extends XmlBaseDiscriminatorColumn
-{
-
-	/**
-	 * Returns the value of the '<em><b>Context Property</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Property</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Context Property</em>' attribute.
-	 * @see #setContextProperty(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3_ContextProperty()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getContextProperty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getContextProperty <em>Context Property</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context Property</em>' attribute.
-	 * @see #getContextProperty()
-	 * @generated
-	 */
-	void setContextProperty(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Table</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Table</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Table</em>' attribute.
-	 * @see #setTable(String)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3_Table()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	String getTable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getTable <em>Table</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Table</em>' attribute.
-	 * @see #getTable()
-	 * @generated
-	 */
-	void setTable(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Primary Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary 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>Primary Key</em>' attribute.
-	 * @see #setPrimaryKey(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.EclipseLinkOrmV2_3Package#getXmlTenantDiscriminatorColumn_2_3_PrimaryKey()
-	 * @model
-	 * @generated
-	 */
-	Boolean getPrimaryKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_3.XmlTenantDiscriminatorColumn_2_3#getPrimaryKey <em>Primary Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key</em>' attribute.
-	 * @see #getPrimaryKey()
-	 * @generated
-	 */
-	void setPrimaryKey(Boolean value);
-} // XmlTenantDiscriminator2_3
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLink2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLink2_4.java
deleted file mode 100644
index 6d04cf5189..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLink2_4.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink;
-import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_2.EclipseLink2_2;
-
-
-@SuppressWarnings("nls")
-public interface EclipseLink2_4
-	extends EclipseLink2_2
-{
-	String SCHEMA_NAMESPACE = EclipseLink.SCHEMA_NAMESPACE;
-	String SCHEMA_LOCATION = "http://www.eclipse.org/eclipselink/xsds/eclipselink_orm_2_4.xsd";
-	String SCHEMA_VERSION	= "2.4";
-
-	// EclipseLink 2.4 specific nodes
-	String DELETE_ALL = "delete-all";
-	String CACHE_INDEX = "cache-index";
-		String CACHE_INDEX__COLUMN_NAME = "column-name";
-	String MULTITENANT__INCLUDE_CRITERIA = "include-criteria";
-
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_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
deleted file mode 100644
index 36195478ab..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Factory.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package
- * @generated
- */
-public class EclipseLinkOrmV2_4Factory extends EFactoryImpl
-{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_4Factory eINSTANCE = init();
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_4Factory init()
-	{
-		try
-		{
-			EclipseLinkOrmV2_4Factory theEclipseLinkOrmV2_4Factory = (EclipseLinkOrmV2_4Factory)EPackage.Registry.INSTANCE.getEFactory("jpt.eclipselink.orm.v2_4.xmi"); 
-			if (theEclipseLinkOrmV2_4Factory != null)
-			{
-				return theEclipseLinkOrmV2_4Factory;
-			}
-		}
-		catch (Exception exception)
-		{
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EclipseLinkOrmV2_4Factory();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_4Factory()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_4Package getEclipseLinkOrmV2_4Package()
-	{
-		return (EclipseLinkOrmV2_4Package)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EclipseLinkOrmV2_4Package getPackage()
-	{
-		return EclipseLinkOrmV2_4Package.eINSTANCE;
-	}
-
-} //EclipseLinkOrmV2_4Factory
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
deleted file mode 100644
index 006839277e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/EclipseLinkOrmV2_4Package.java
+++ /dev/null
@@ -1,961 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-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;
-
-/**
- * <!-- 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.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Factory
- * @model kind="package"
- * @generated
- */
-public class EclipseLinkOrmV2_4Package extends EPackageImpl
-{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNAME = "v2_4";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_URI = "jpt.eclipselink.orm.v2_4.xmi";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final EclipseLinkOrmV2_4Package eINSTANCE = org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4 <em>Xml Multitenant 24</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMultitenant_2_4()
-	 * @generated
-	 */
-	public static final int XML_MULTITENANT_24 = 0;
-
-	/**
-	 * The feature id for the '<em><b>Include Criteria</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT_24__INCLUDE_CRITERIA = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Multitenant 24</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MULTITENANT_24_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 <em>Xml Element Collection 24</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlElementCollection_2_4()
-	 * @generated
-	 */
-	public static final int XML_ELEMENT_COLLECTION_24 = 1;
-
-	/**
-	 * The feature id for the '<em><b>Delete All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_24__DELETE_ALL = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Element Collection 24</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ELEMENT_COLLECTION_24_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 <em>Xml One To Many 24</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToMany_2_4()
-	 * @generated
-	 */
-	public static final int XML_ONE_TO_MANY_24 = 2;
-
-	/**
-	 * The feature id for the '<em><b>Delete All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_24__DELETE_ALL = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml One To Many 24</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ONE_TO_MANY_24_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 <em>Xml Entity 24</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4()
-	 * @generated
-	 */
-	public static final int XML_ENTITY_24 = 3;
-
-	/**
-	 * The feature id for the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_24__CACHE_INDEX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Entity 24</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ENTITY_24_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4 <em>Xml Basic 24</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlBasic_2_4()
-	 * @generated
-	 */
-	public static final int XML_BASIC_24 = 4;
-
-	/**
-	 * The feature id for the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_24__CACHE_INDEX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Basic 24</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_BASIC_24_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4 <em>Xml Cache Index 24</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlCacheIndex_2_4()
-	 * @generated
-	 */
-	public static final int XML_CACHE_INDEX_24 = 5;
-
-	/**
-	 * The feature id for the '<em><b>Column Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE_INDEX_24__COLUMN_NAMES = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Cache Index 24</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CACHE_INDEX_24_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 <em>Xml Id 24</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4()
-	 * @generated
-	 */
-	public static final int XML_ID_24 = 6;
-
-	/**
-	 * The feature id for the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_24__CACHE_INDEX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Id 24</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_ID_24_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4 <em>Xml Mapped Superclass 24</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMappedSuperclass_2_4()
-	 * @generated
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_24 = 7;
-
-	/**
-	 * The feature id for the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_24__CACHE_INDEX = 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Mapped Superclass 24</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_MAPPED_SUPERCLASS_24_FEATURE_COUNT = 1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMultitenant_2_4EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlElementCollection_2_4EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlOneToMany_2_4EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlEntity_2_4EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlBasic_2_4EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlCacheIndex_2_4EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlId_2_4EClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xmlMappedSuperclass_2_4EClass = 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.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EclipseLinkOrmV2_4Package()
-	{
-		super(eNS_URI, EclipseLinkOrmV2_4Factory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link EclipseLinkOrmV2_4Package#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EclipseLinkOrmV2_4Package init()
-	{
-		if (isInited) return (EclipseLinkOrmV2_4Package)EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_4Package.eNS_URI);
-
-		// Obtain or create and register package
-		EclipseLinkOrmV2_4Package theEclipseLinkOrmV2_4Package = (EclipseLinkOrmV2_4Package)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EclipseLinkOrmV2_4Package ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EclipseLinkOrmV2_4Package());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		OrmPackage.eINSTANCE.eClass();
-		CommonPackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		EclipseLinkOrmPackage theEclipseLinkOrmPackage = (EclipseLinkOrmPackage)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) instanceof EclipseLinkOrmPackage ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmPackage.eNS_URI) : EclipseLinkOrmPackage.eINSTANCE);
-		EclipseLinkOrmV1_1Package theEclipseLinkOrmV1_1Package = (EclipseLinkOrmV1_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) instanceof EclipseLinkOrmV1_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV1_1Package.eNS_URI) : EclipseLinkOrmV1_1Package.eINSTANCE);
-		EclipseLinkOrmV2_0Package theEclipseLinkOrmV2_0Package = (EclipseLinkOrmV2_0Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) instanceof EclipseLinkOrmV2_0Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_0Package.eNS_URI) : EclipseLinkOrmV2_0Package.eINSTANCE);
-		EclipseLinkOrmV2_1Package theEclipseLinkOrmV2_1Package = (EclipseLinkOrmV2_1Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) instanceof EclipseLinkOrmV2_1Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_1Package.eNS_URI) : EclipseLinkOrmV2_1Package.eINSTANCE);
-		EclipseLinkOrmV2_2Package theEclipseLinkOrmV2_2Package = (EclipseLinkOrmV2_2Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) instanceof EclipseLinkOrmV2_2Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_2Package.eNS_URI) : EclipseLinkOrmV2_2Package.eINSTANCE);
-		EclipseLinkOrmV2_3Package theEclipseLinkOrmV2_3Package = (EclipseLinkOrmV2_3Package)(EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) instanceof EclipseLinkOrmV2_3Package ? EPackage.Registry.INSTANCE.getEPackage(EclipseLinkOrmV2_3Package.eNS_URI) : EclipseLinkOrmV2_3Package.eINSTANCE);
-
-		// Create package meta-data objects
-		theEclipseLinkOrmV2_4Package.createPackageContents();
-		theEclipseLinkOrmPackage.createPackageContents();
-		theEclipseLinkOrmV1_1Package.createPackageContents();
-		theEclipseLinkOrmV2_0Package.createPackageContents();
-		theEclipseLinkOrmV2_1Package.createPackageContents();
-		theEclipseLinkOrmV2_2Package.createPackageContents();
-		theEclipseLinkOrmV2_3Package.createPackageContents();
-
-		// Initialize created meta-data
-		theEclipseLinkOrmV2_4Package.initializePackageContents();
-		theEclipseLinkOrmPackage.initializePackageContents();
-		theEclipseLinkOrmV1_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_0Package.initializePackageContents();
-		theEclipseLinkOrmV2_1Package.initializePackageContents();
-		theEclipseLinkOrmV2_2Package.initializePackageContents();
-		theEclipseLinkOrmV2_3Package.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEclipseLinkOrmV2_4Package.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(EclipseLinkOrmV2_4Package.eNS_URI, theEclipseLinkOrmV2_4Package);
-		return theEclipseLinkOrmV2_4Package;
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4 <em>Xml Multitenant 24</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Multitenant 24</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4
-	 * @generated
-	 */
-	public EClass getXmlMultitenant_2_4()
-	{
-		return xmlMultitenant_2_4EClass;
-	}
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria <em>Include Criteria</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Include Criteria</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria()
-	 * @see #getXmlMultitenant_2_4()
-	 * @generated
-	 */
-	public EAttribute getXmlMultitenant_2_4_IncludeCriteria()
-	{
-		return (EAttribute)xmlMultitenant_2_4EClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 <em>Xml Element Collection 24</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Element Collection 24</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4
-	 * @generated
-	 */
-	public EClass getXmlElementCollection_2_4()
-	{
-		return xmlElementCollection_2_4EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll <em>Delete All</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Delete All</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll()
-	 * @see #getXmlElementCollection_2_4()
-	 * @generated
-	 */
-	public EAttribute getXmlElementCollection_2_4_DeleteAll()
-	{
-		return (EAttribute)xmlElementCollection_2_4EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 <em>Xml One To Many 24</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml One To Many 24</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4
-	 * @generated
-	 */
-	public EClass getXmlOneToMany_2_4()
-	{
-		return xmlOneToMany_2_4EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll <em>Delete All</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Delete All</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll()
-	 * @see #getXmlOneToMany_2_4()
-	 * @generated
-	 */
-	public EAttribute getXmlOneToMany_2_4_DeleteAll()
-	{
-		return (EAttribute)xmlOneToMany_2_4EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 <em>Xml Entity 24</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Entity 24</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4
-	 * @generated
-	 */
-	public EClass getXmlEntity_2_4()
-	{
-		return xmlEntity_2_4EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex <em>Cache Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cache Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex()
-	 * @see #getXmlEntity_2_4()
-	 * @generated
-	 */
-	public EReference getXmlEntity_2_4_CacheIndex()
-	{
-		return (EReference)xmlEntity_2_4EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4 <em>Xml Basic 24</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Basic 24</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4
-	 * @generated
-	 */
-	public EClass getXmlBasic_2_4()
-	{
-		return xmlBasic_2_4EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getCacheIndex <em>Cache Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cache Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getCacheIndex()
-	 * @see #getXmlBasic_2_4()
-	 * @generated
-	 */
-	public EReference getXmlBasic_2_4_CacheIndex()
-	{
-		return (EReference)xmlBasic_2_4EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4 <em>Xml Cache Index 24</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Cache Index 24</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4
-	 * @generated
-	 */
-	public EClass getXmlCacheIndex_2_4()
-	{
-		return xmlCacheIndex_2_4EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4#getColumnNames <em>Column Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Column Names</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4#getColumnNames()
-	 * @see #getXmlCacheIndex_2_4()
-	 * @generated
-	 */
-	public EAttribute getXmlCacheIndex_2_4_ColumnNames()
-	{
-		return (EAttribute)xmlCacheIndex_2_4EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 <em>Xml Id 24</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Id 24</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4
-	 * @generated
-	 */
-	public EClass getXmlId_2_4()
-	{
-		return xmlId_2_4EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex <em>Cache Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cache Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex()
-	 * @see #getXmlId_2_4()
-	 * @generated
-	 */
-	public EReference getXmlId_2_4_CacheIndex()
-	{
-		return (EReference)xmlId_2_4EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4 <em>Xml Mapped Superclass 24</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Xml Mapped Superclass 24</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4
-	 * @generated
-	 */
-	public EClass getXmlMappedSuperclass_2_4()
-	{
-		return xmlMappedSuperclass_2_4EClass;
-	}
-
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4#getCacheIndex <em>Cache Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Cache Index</em>'.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4#getCacheIndex()
-	 * @see #getXmlMappedSuperclass_2_4()
-	 * @generated
-	 */
-	public EReference getXmlMappedSuperclass_2_4_CacheIndex()
-	{
-		return (EReference)xmlMappedSuperclass_2_4EClass.getEStructuralFeatures().get(0);
-	}
-
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	public EclipseLinkOrmV2_4Factory getEclipseLinkOrmV2_4Factory()
-	{
-		return (EclipseLinkOrmV2_4Factory)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
-		xmlMultitenant_2_4EClass = createEClass(XML_MULTITENANT_24);
-		createEAttribute(xmlMultitenant_2_4EClass, XML_MULTITENANT_24__INCLUDE_CRITERIA);
-
-		xmlElementCollection_2_4EClass = createEClass(XML_ELEMENT_COLLECTION_24);
-		createEAttribute(xmlElementCollection_2_4EClass, XML_ELEMENT_COLLECTION_24__DELETE_ALL);
-
-		xmlOneToMany_2_4EClass = createEClass(XML_ONE_TO_MANY_24);
-		createEAttribute(xmlOneToMany_2_4EClass, XML_ONE_TO_MANY_24__DELETE_ALL);
-
-		xmlEntity_2_4EClass = createEClass(XML_ENTITY_24);
-		createEReference(xmlEntity_2_4EClass, XML_ENTITY_24__CACHE_INDEX);
-
-		xmlBasic_2_4EClass = createEClass(XML_BASIC_24);
-		createEReference(xmlBasic_2_4EClass, XML_BASIC_24__CACHE_INDEX);
-
-		xmlCacheIndex_2_4EClass = createEClass(XML_CACHE_INDEX_24);
-		createEAttribute(xmlCacheIndex_2_4EClass, XML_CACHE_INDEX_24__COLUMN_NAMES);
-
-		xmlId_2_4EClass = createEClass(XML_ID_24);
-		createEReference(xmlId_2_4EClass, XML_ID_24__CACHE_INDEX);
-
-		xmlMappedSuperclass_2_4EClass = createEClass(XML_MAPPED_SUPERCLASS_24);
-		createEReference(xmlMappedSuperclass_2_4EClass, XML_MAPPED_SUPERCLASS_24__CACHE_INDEX);
-	}
-
-	/**
-	 * <!-- 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
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(xmlMultitenant_2_4EClass, XmlMultitenant_2_4.class, "XmlMultitenant_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlMultitenant_2_4_IncludeCriteria(), theXMLTypePackage.getBooleanObject(), "includeCriteria", null, 0, 1, XmlMultitenant_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlElementCollection_2_4EClass, XmlElementCollection_2_4.class, "XmlElementCollection_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlElementCollection_2_4_DeleteAll(), theXMLTypePackage.getBoolean(), "deleteAll", null, 0, 1, XmlElementCollection_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlOneToMany_2_4EClass, XmlOneToMany_2_4.class, "XmlOneToMany_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlOneToMany_2_4_DeleteAll(), theXMLTypePackage.getBoolean(), "deleteAll", null, 0, 1, XmlOneToMany_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlEntity_2_4EClass, XmlEntity_2_4.class, "XmlEntity_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlEntity_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlEntity_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlBasic_2_4EClass, XmlBasic_2_4.class, "XmlBasic_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlBasic_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlBasic_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlCacheIndex_2_4EClass, XmlCacheIndex_2_4.class, "XmlCacheIndex_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlCacheIndex_2_4_ColumnNames(), theXMLTypePackage.getString(), "columnNames", null, 0, -1, XmlCacheIndex_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlId_2_4EClass, XmlId_2_4.class, "XmlId_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlId_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlId_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlMappedSuperclass_2_4EClass, XmlMappedSuperclass_2_4.class, "XmlMappedSuperclass_2_4", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXmlMappedSuperclass_2_4_CacheIndex(), this.getXmlCacheIndex_2_4(), null, "cacheIndex", null, 0, 1, XmlMappedSuperclass_2_4.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-	}
-
-	/**
-	 * <!-- 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.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4 <em>Xml Multitenant 24</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMultitenant_2_4()
-		 * @generated
-		 */
-		public static final EClass XML_MULTITENANT_24 = eINSTANCE.getXmlMultitenant_2_4();
-
-		/**
-		 * The meta object literal for the '<em><b>Include Criteria</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_MULTITENANT_24__INCLUDE_CRITERIA = eINSTANCE.getXmlMultitenant_2_4_IncludeCriteria();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4 <em>Xml Element Collection 24</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlElementCollection_2_4()
-		 * @generated
-		 */
-		public static final EClass XML_ELEMENT_COLLECTION_24 = eINSTANCE.getXmlElementCollection_2_4();
-
-		/**
-		 * The meta object literal for the '<em><b>Delete All</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ELEMENT_COLLECTION_24__DELETE_ALL = eINSTANCE.getXmlElementCollection_2_4_DeleteAll();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4 <em>Xml One To Many 24</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToMany_2_4()
-		 * @generated
-		 */
-		public static final EClass XML_ONE_TO_MANY_24 = eINSTANCE.getXmlOneToMany_2_4();
-
-		/**
-		 * The meta object literal for the '<em><b>Delete All</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_ONE_TO_MANY_24__DELETE_ALL = eINSTANCE.getXmlOneToMany_2_4_DeleteAll();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4 <em>Xml Entity 24</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4()
-		 * @generated
-		 */
-		public static final EClass XML_ENTITY_24 = eINSTANCE.getXmlEntity_2_4();
-
-		/**
-		 * The meta object literal for the '<em><b>Cache Index</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ENTITY_24__CACHE_INDEX = eINSTANCE.getXmlEntity_2_4_CacheIndex();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4 <em>Xml Basic 24</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlBasic_2_4()
-		 * @generated
-		 */
-		public static final EClass XML_BASIC_24 = eINSTANCE.getXmlBasic_2_4();
-
-		/**
-		 * The meta object literal for the '<em><b>Cache Index</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_BASIC_24__CACHE_INDEX = eINSTANCE.getXmlBasic_2_4_CacheIndex();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4 <em>Xml Cache Index 24</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlCacheIndex_2_4()
-		 * @generated
-		 */
-		public static final EClass XML_CACHE_INDEX_24 = eINSTANCE.getXmlCacheIndex_2_4();
-
-		/**
-		 * The meta object literal for the '<em><b>Column Names</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EAttribute XML_CACHE_INDEX_24__COLUMN_NAMES = eINSTANCE.getXmlCacheIndex_2_4_ColumnNames();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4 <em>Xml Id 24</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4()
-		 * @generated
-		 */
-		public static final EClass XML_ID_24 = eINSTANCE.getXmlId_2_4();
-
-		/**
-		 * The meta object literal for the '<em><b>Cache Index</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_ID_24__CACHE_INDEX = eINSTANCE.getXmlId_2_4_CacheIndex();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4 <em>Xml Mapped Superclass 24</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4
-		 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMappedSuperclass_2_4()
-		 * @generated
-		 */
-		public static final EClass XML_MAPPED_SUPERCLASS_24 = eINSTANCE.getXmlMappedSuperclass_2_4();
-
-		/**
-		 * The meta object literal for the '<em><b>Cache Index</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public static final EReference XML_MAPPED_SUPERCLASS_24__CACHE_INDEX = eINSTANCE.getXmlMappedSuperclass_2_4_CacheIndex();
-
-	}
-
-} //EclipseLinkOrmV2_4Package
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java
deleted file mode 100644
index b21c332b05..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlBasic_2_4.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Basic 24</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getCacheIndex <em>Cache Index</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlBasic_2_4()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlBasic_2_4 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Index</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>Cache Index</em>' containment reference.
-	 * @see #setCacheIndex(XmlCacheIndex_2_4)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlBasic_2_4_CacheIndex()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlCacheIndex_2_4 getCacheIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlBasic_2_4#getCacheIndex <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Index</em>' containment reference.
-	 * @see #getCacheIndex()
-	 * @generated
-	 */
-	void setCacheIndex(XmlCacheIndex_2_4 value);
-
-} // XmlBasic_2_4
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
deleted file mode 100644
index 86a129458b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlCacheIndex_2_4.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Cache Index 24</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlCacheIndex_2_4#getColumnNames <em>Column Names</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlCacheIndex_2_4 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Column Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Names</em>' attribute list.
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlCacheIndex_2_4_ColumnNames()
-	 * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
-	 * @generated
-	 */
-	EList<String> getColumnNames();
-
-} // XmlCacheIndex_2_4
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
deleted file mode 100644
index 8564b2b1ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlElementCollection_2_4.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Element Collection 24</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll <em>Delete All</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlElementCollection_2_4 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Delete All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delete All</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delete All</em>' attribute.
-	 * @see #setDeleteAll(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlElementCollection_2_4_DeleteAll()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isDeleteAll();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlElementCollection_2_4#isDeleteAll <em>Delete All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delete All</em>' attribute.
-	 * @see #isDeleteAll()
-	 * @generated
-	 */
-	void setDeleteAll(boolean value);
-
-} // XmlElementCollection_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java
deleted file mode 100644
index 0d7a419336..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlEntity_2_4.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Entity 24</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex <em>Cache Index</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlEntity_2_4 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Index</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>Cache Index</em>' containment reference.
-	 * @see #setCacheIndex(XmlCacheIndex_2_4)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlEntity_2_4_CacheIndex()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlCacheIndex_2_4 getCacheIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlEntity_2_4#getCacheIndex <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Index</em>' containment reference.
-	 * @see #getCacheIndex()
-	 * @generated
-	 */
-	void setCacheIndex(XmlCacheIndex_2_4 value);
-
-} // XmlEntity_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java
deleted file mode 100644
index 2e108a7a81..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlId_2_4.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Id 24</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex <em>Cache Index</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlId_2_4 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Index</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>Cache Index</em>' containment reference.
-	 * @see #setCacheIndex(XmlCacheIndex_2_4)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlId_2_4_CacheIndex()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlCacheIndex_2_4 getCacheIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlId_2_4#getCacheIndex <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Index</em>' containment reference.
-	 * @see #getCacheIndex()
-	 * @generated
-	 */
-	void setCacheIndex(XmlCacheIndex_2_4 value);
-
-} // XmlId_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java
deleted file mode 100644
index 823e4f8eee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMappedSuperclass_2_4.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Mapped Superclass 24</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4#getCacheIndex <em>Cache Index</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMappedSuperclass_2_4()
- * @model kind="class" interface="true" abstract="true"
- * @extends JpaEObject
- * @generated
- */
-public interface XmlMappedSuperclass_2_4 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Cache Index</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Cache Index</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>Cache Index</em>' containment reference.
-	 * @see #setCacheIndex(XmlCacheIndex_2_4)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMappedSuperclass_2_4_CacheIndex()
-	 * @model containment="true"
-	 * @generated
-	 */
-	XmlCacheIndex_2_4 getCacheIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMappedSuperclass_2_4#getCacheIndex <em>Cache Index</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Cache Index</em>' containment reference.
-	 * @see #getCacheIndex()
-	 * @generated
-	 */
-	void setCacheIndex(XmlCacheIndex_2_4 value);
-
-} // XmlMappedSuperclass_2_4
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
deleted file mode 100644
index a8c7b5d69f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlMultitenant_2_4.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml Multitenant 24</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria <em>Include Criteria</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlMultitenant_2_4 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Include Criteria</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Include Criteria</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Include Criteria</em>' attribute.
-	 * @see #setIncludeCriteria(Boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlMultitenant_2_4_IncludeCriteria()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
-	 * @generated
-	 */
-	Boolean getIncludeCriteria();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlMultitenant_2_4#getIncludeCriteria <em>Include Criteria</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Include Criteria</em>' attribute.
-	 * @see #getIncludeCriteria()
-	 * @generated
-	 */
-	void setIncludeCriteria(Boolean value);
-
-} // XmlMultitenant_2_4
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
deleted file mode 100644
index 87cd3826bb..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_4/XmlOneToMany_2_4.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4;
-
-import org.eclipse.jpt.jpa.core.resource.xml.JpaEObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Xml One To Many 24</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll <em>Delete All</em>}</li>
- * </ul>
- * </p>
- *
- * @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
- * @generated
- */
-public interface XmlOneToMany_2_4 extends JpaEObject
-{
-	/**
-	 * Returns the value of the '<em><b>Delete All</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Delete All</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Delete All</em>' attribute.
-	 * @see #setDeleteAll(boolean)
-	 * @see org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.EclipseLinkOrmV2_4Package#getXmlOneToMany_2_4_DeleteAll()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
-	 * @generated
-	 */
-	boolean isDeleteAll();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.jpa.eclipselink.core.resource.orm.v2_4.XmlOneToMany_2_4#isDeleteAll <em>Delete All</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delete All</em>' attribute.
-	 * @see #isDeleteAll()
-	 * @generated
-	 */
-	void setDeleteAll(boolean value);
-
-} // XmlOneToMany_2_4
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkElementCollectionMapping2_0.java
deleted file mode 100644
index 1aa54c3a95..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkElementCollectionMapping2_0.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchMapping;
-
-/**
- * EclipseLink element collection mapping
- * <p>
- * 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.
- * 
- * @version 2.3
- * @since 2.3
- */
-public interface EclipseLinkElementCollectionMapping2_0
-	extends ElementCollectionMapping2_0, EclipseLinkJoinFetchMapping
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToManyMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToManyMapping2_0.java
deleted file mode 100644
index 3c9e1e0935..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToManyMapping2_0.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping;
-
-/**
- * EclipseLink 1:m mapping
- * <p>
- * 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.
- * 
- * @version 3.0
- * @since 3.0
- */
-public interface EclipseLinkOneToManyMapping2_0 
-	extends EclipseLinkOneToManyMapping, OneToManyMapping2_0
-{
-	EclipseLinkOneToManyRelationship2_0 getRelationship();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToManyRelationship2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToManyRelationship2_0.java
deleted file mode 100644
index d9cc22f44b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToManyRelationship2_0.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyRelationship2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyRelationship;
-
-/**
- * EclipseLink 2.0 1:m relationship
- * <p>
- * 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.
- * 
- * @version 2.3
- * @since 2.3
- */
-public interface EclipseLinkOneToManyRelationship2_0
-	extends EclipseLinkOneToManyRelationship,
-			OneToManyRelationship2_0
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToOneMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToOneMapping2_0.java
deleted file mode 100644
index b071eafb94..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/EclipseLinkOneToOneMapping2_0.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping;
-
-/**
- * EclipseLink 1:1 mapping
- * <p>
- * 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.
- * 
- * @version 3.0
- * @since 3.0
- */
-public interface EclipseLinkOneToOneMapping2_0
-	extends EclipseLinkOneToOneMapping, OneToOneMapping2_0
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/java/EclipseLinkJavaOneToManyRelationship2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/java/EclipseLinkJavaOneToManyRelationship2_0.java
deleted file mode 100644
index 53c317091c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/java/EclipseLinkJavaOneToManyRelationship2_0.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.java;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToManyRelationship2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaOneToManyRelationship;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.EclipseLinkOneToManyRelationship2_0;
-
-/**
- * EclipseLink 2.0 Java 1:m relationship
- * <p>
- * 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 interface EclipseLinkJavaOneToManyRelationship2_0
-	extends EclipseLinkOneToManyRelationship2_0,
-			EclipseLinkJavaOneToManyRelationship,
-			JavaOneToManyRelationship2_0
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/orm/EclipseLinkOrmOneToManyRelationship2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/orm/EclipseLinkOrmOneToManyRelationship2_0.java
deleted file mode 100644
index 4484297ea8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/orm/EclipseLinkOrmOneToManyRelationship2_0.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.orm;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToManyRelationship2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmOneToManyRelationship;
-import org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.EclipseLinkOneToManyRelationship2_0;
-
-/**
- * EclipseLink 2.0 <code>orm.xml</code> 1:m relationship
- * <p>
- * 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 interface EclipseLinkOrmOneToManyRelationship2_0
-	extends EclipseLinkOneToManyRelationship2_0,
-			EclipseLinkOrmOneToManyRelationship,
-			OrmOneToManyRelationship2_0
-{
-	// combine various interfaces
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/connection/Connection2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/connection/Connection2_0.java
deleted file mode 100644
index bccfac85c2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/connection/Connection2_0.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.persistence.connection;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.connection.JpaConnection2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.connection.Connection;
-
-/**
- *  Connection2_0
- */
-public interface Connection2_0 extends Connection, JpaConnection2_0
-{
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/logging/Logging2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/logging/Logging2_0.java
deleted file mode 100644
index 3aeeee72d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/logging/Logging2_0.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009, 2010 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.persistence.logging;
-
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.Logging;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.logging.LoggingLevel;
-/**
- *  Logging2_0
- */
-public interface Logging2_0 extends Logging
-{
-	public static final String CATEGORY_PREFIX_ = "eclipselink.logging.level."; //$NON-NLS-1$
-
-	Boolean getDefaultConnection();
-	Boolean getConnection();
-	void setConnection(Boolean connection);
-		static final String CONNECTION_PROPERTY = "connection"; //$NON-NLS-1$
-		// EclipseLink key string
-		static final String ECLIPSELINK_CONNECTION = "eclipselink.logging.connection"; //$NON-NLS-1$
-		static final Boolean DEFAULT_CONNECTION = Boolean.TRUE;
-		
-	LoggingLevel getCategoriesDefaultLevel();
-	LoggingLevel getLevel(String category);
-	void setLevel(String category, LoggingLevel level);
-	void setDefaultLevel(LoggingLevel level);
-	static final String CATEGORIES_DEFAULT_LOGGING_PROPERTY = "categoriesDefaultLoggingLevel"; //$NON-NLS-1$
-
-		static final String SQL_CATEGORY_LOGGING_PROPERTY = "sqlLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_SQL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "sql"; //$NON-NLS-1$
-	
-		static final String TRANSACTION_CATEGORY_LOGGING_PROPERTY = "transactionLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_TRANSACTION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "transaction"; //$NON-NLS-1$
-	
-		static final String EVENT_CATEGORY_LOGGING_PROPERTY = "eventLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_EVENT_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "event"; //$NON-NLS-1$
-	
-		static final String CONNECTION_CATEGORY_LOGGING_PROPERTY = "connectionLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_CONNECTION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "connection"; //$NON-NLS-1$
-	
-		static final String QUERY_CATEGORY_LOGGING_PROPERTY = "queryLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_QUERY_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "query"; //$NON-NLS-1$
-	
-		static final String CACHE_CATEGORY_LOGGING_PROPERTY = "cacheLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_CACHE_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "cache"; //$NON-NLS-1$
-	
-		static final String PROPAGATION_CATEGORY_LOGGING_PROPERTY = "propagationLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_PROPAGATION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "propagation"; //$NON-NLS-1$
-	
-		static final String SEQUENCING_CATEGORY_LOGGING_PROPERTY = "sequencingLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_SEQUENCING_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "sequencing"; //$NON-NLS-1$
-	
-		static final String EJB_CATEGORY_LOGGING_PROPERTY = "ejbLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_EJB_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "ejb"; //$NON-NLS-1$
-	
-		static final String DMS_CATEGORY_LOGGING_PROPERTY = "dmsLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_DMS_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "dms"; //$NON-NLS-1$
-	
-		static final String EJB_OR_METADATA_CATEGORY_LOGGING_PROPERTY = "ejb_or_metadataLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_EJB_OR_METADATA_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "ejb_or_metadata"; //$NON-NLS-1$
-	
-		static final String METAMODEL_CATEGORY_LOGGING_PROPERTY = "jpa_metamodelLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_METAMODEL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "jpa_metamodel"; //$NON-NLS-1$
-
-		static final String WEAVER_CATEGORY_LOGGING_PROPERTY = "weaverLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_WEAVER_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "weaver"; //$NON-NLS-1$
-
-		static final String PROPERTIES_CATEGORY_LOGGING_PROPERTY = "propertiesLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_PROPERTIES_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "properties"; //$NON-NLS-1$
-
-		static final String SERVER_CATEGORY_LOGGING_PROPERTY = "serverLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_SERVER_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "server"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/options/Options2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/options/Options2_0.java
deleted file mode 100644
index 5bf263a9d7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/context/persistence/options/Options2_0.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2009 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.context.persistence.options;
-
-import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.JpaOptions2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.options.Options;
-
-/**
- *  Options2_0
- */
-public interface Options2_0 extends Options, JpaOptions2_0
-{
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/resource/java/EclipseLink2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/resource/java/EclipseLink2_0.java
deleted file mode 100644
index 76e47ecc81..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/resource/java/EclipseLink2_0.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.resource.java;
-
-/**
- * EclipseLink Java-related stuff (annotations etc.)
- * 
- * 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.
- * 
- * @version 3.1
- * @since 3.1
- */
-@SuppressWarnings("nls")
-public interface EclipseLink2_0 {
-
-	// EclipseLink package
-	String PACKAGE = "org.eclipse.persistence.annotations"; //$NON-NLS-1$
-	String PACKAGE_ = PACKAGE + ".";
-
-
-	// ********** API **********
-
-	// EclispeLink 2.0 annotations
-	String MAP_KEY_CONVERT = PACKAGE_ + "MapKeyConvert";
-		String MAP_KEY_CONVERT__VALUE = "value";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/resource/java/EclipseLinkMapKeyConvertAnnotation2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/resource/java/EclipseLinkMapKeyConvertAnnotation2_0.java
deleted file mode 100644
index 95631f9cc2..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_0/resource/java/EclipseLinkMapKeyConvertAnnotation2_0.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_0.resource.java;
-
-import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConvertAnnotation;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.MapKeyConvert
- * 
- * 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.
- * 
- * @version 3.1
- * @since 3.1
- */
-public interface EclipseLinkMapKeyConvertAnnotation2_0
-	extends EclipseLinkConvertAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink2_0.MAP_KEY_CONVERT;
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_1/resource/java/EclipseLink2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_1/resource/java/EclipseLink2_1.java
deleted file mode 100644
index 4eb18105c5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_1/resource/java/EclipseLink2_1.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java;
-
-/**
- * EclipseLink Java-related stuff (annotations etc.)
- * 
- * 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.
- * 
- * @version 2.3
- * @since 2.3
- */
-@SuppressWarnings("nls")
-public interface EclipseLink2_1 {
-
-	// EclipseLink package
-	String PACKAGE = "org.eclipse.persistence.annotations"; //$NON-NLS-1$
-	String PACKAGE_ = PACKAGE + ".";
-
-
-	// ********** API **********
-
-	// EclispeLink 2.1 annotations
-	String CLASS_EXTRACTOR = PACKAGE_ + "ClassExtractor";
-		String CLASS_EXTRACTOR__VALUE = "value";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_1/resource/java/EclipseLinkClassExtractorAnnotation2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_1/resource/java/EclipseLinkClassExtractorAnnotation2_1.java
deleted file mode 100644
index 2cb4078c73..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_1/resource/java/EclipseLinkClassExtractorAnnotation2_1.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_1.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * <code>org.eclipse.persistence.annotations.ClassExtractor</code>
- * <p>
- * 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.
- * 
- * @version 3.1
- * @since 2.3
- */
-public interface EclipseLinkClassExtractorAnnotation2_1
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink2_1.CLASS_EXTRACTOR;
-
-	/**
-	 * Corresponds to the 'value' element of the ClassExtractor annotation.
-	 * Return null if the element does not exist in Java.
-	 * Return the portion of the value preceding ".class".
-	 * <pre>
-	 *     &#64;ClassExtractor(value=MyExtractor.class)
-	 * </pre>
-	 * will return "MyExtractor"
-	 */
-	String getValue();
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'value' element of the ClassExtractor annotation.
-	 * Set to null to remove the element.
-	 */
-	void setValue(String value);
-
-	/**
-	 * Return the {@link TextRange} for the 'value' element. If the element 
-	 * does not exist return the {@link TextRange} for the ClassExtractor annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return the fully-qualified class name as resolved by the
-	 * AST's bindings.
-	 * <pre>
-	 *     &#64;ClassExtractor(MyExtractor.class)
-	 * </pre>
-	 * will return <code>"model.MyExtractor"</code> if there is an import for
-	 * <code>model.MyExtractor</code>.
-	 */
-	String getFullyQualifiedClassName();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/EclipseLinkMappingKeys2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/EclipseLinkMappingKeys2_3.java
deleted file mode 100644
index 3e94da1df0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/EclipseLinkMappingKeys2_3.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_3;
-
-/**
- * 
- * 
- * 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.
- */
-@SuppressWarnings("nls")
-public interface EclipseLinkMappingKeys2_3 {
-
-	String STRUCTURE_ATTRIBUTE_MAPPING_KEY = "structure";
-	String ARRAY_ATTRIBUTE_MAPPING_KEY = "array";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLink2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLink2_3.java
deleted file mode 100644
index bb9ca9332f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLink2_3.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java;
-
-/**
- * EclipseLink Java-related stuff (annotations etc.)
- * 
- * 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.
- * 
- * @version 3.1
- * @since 3.1
- */
-@SuppressWarnings("nls")
-public interface EclipseLink2_3 {
-
-	// EclipseLink package
-	String PACKAGE = "org.eclipse.persistence.annotations"; //$NON-NLS-1$
-	String PACKAGE_ = PACKAGE + ".";
-
-
-	// ********** API **********
-
-	// EclispeLink 2.3 annotations
-	String MULTITENANT = PACKAGE_ + "Multitenant";
-		String MULTITENANT__VALUE = "value";
-
-	String MULTITENANT_TYPE = PACKAGE_ + "MultitenantType";
-		String MULTITENANT_TYPE_ = MULTITENANT_TYPE + ".";
-		String MULTITENANT_TYPE__SINGLE_TABLE = MULTITENANT_TYPE_ + "SINGLE_TABLE";
-		String MULTITENANT_TYPE__TABLE_PER_TENANT = MULTITENANT_TYPE_ + "TABLE_PER_TENANT";
-
-	String TENANT_DISCRIMINATOR_COLUMN = PACKAGE_ + "TenantDiscriminatorColumn";
-		String TENANT_DISCRIMINATOR_COLUMN__NAME = "name";
-		String TENANT_DISCRIMINATOR_COLUMN__CONTEXT_PROPERTY = "contextProperty";
-		String TENANT_DISCRIMINATOR_COLUMN__DISCRIMINATOR_TYPE = "discriminatorType";
-		String TENANT_DISCRIMINATOR_COLUMN__COLUMN_DEFINITION = "columnDefinition";
-		String TENANT_DISCRIMINATOR_COLUMN__LENGTH = "length";
-		String TENANT_DISCRIMINATOR_COLUMN__TABLE = "table";
-		String TENANT_DISCRIMINATOR_COLUMN__PRIMARY_KEY = "primaryKey";
-
-	String TENANT_DISCRIMINATOR_COLUMNS = PACKAGE_ + "TenantDiscriminatorColumns";
-		String TENANT_DISCRIMINATOR_COLUMNS__VALUE = "value";
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLinkMultitenantAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLinkMultitenantAnnotation.java
deleted file mode 100644
index dd8fc04180..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLinkMultitenantAnnotation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.Annotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.Multitenant
- * 
- * 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.
- * 
- * @version 3.1
- * @since 3.1
- */
-public interface EclipseLinkMultitenantAnnotation
-	extends Annotation
-{
-	String ANNOTATION_NAME = EclipseLink2_3.MULTITENANT;
-
-
-	/**
-	 * Corresponds to the 'value' element of the Multitenant annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	MultitenantType getValue();
-		String VALUE_PROPERTY = "value"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'value' element of the Multitenant annotation.
-	 * Set to null to remove the element.
-	 */
-	void setValue(MultitenantType value);
-
-	/**
-	 * Return the {@link TextRange} for the 'value' element. If the element 
-	 * does not exist return the {@link TextRange} for the Multitenant annotation.
-	 */
-	TextRange getValueTextRange(CompilationUnit astRoot);
-
-
-	//********* include criteria added in EclipseLink 2.4 **********
-	/**
-	 * Corresponds to the 'includeCriteria' element of the Multitenant annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Boolean getIncludeCriteria();
-		String INCLUDE_CRITERIA_PROPERTY = "includeCriteria"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'includeCriteria' element of the Multitenant annotation.
-	 * Set to null to remove the element.
-	 */
-	void setIncludeCriteria(Boolean includeCriteria);
-
-	/**
-	 * Return the {@link TextRange} for the 'includeCriteria' element.
-	 * If the element does not exist return the {@link TextRange}
-	 * for the Multitenant annotation.
-	 */
-	TextRange getIncludeCriteriaTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnAnnotation.java
deleted file mode 100644
index a512954630..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/EclipseLinkTenantDiscriminatorColumnAnnotation.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java;
-
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.common.core.resource.java.NestableAnnotation;
-import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation;
-
-/**
- * Corresponds to the EclipseLink annotation
- * org.eclipse.persistence.annotations.TenantDiscriminatorColumn
- * 
- * 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.
- * 
- * @version 3.1
- * @since 3.1
- */
-public interface EclipseLinkTenantDiscriminatorColumnAnnotation
-	extends DiscriminatorColumnAnnotation,
-			NestableAnnotation
-{
-	String ANNOTATION_NAME = EclipseLink2_3.TENANT_DISCRIMINATOR_COLUMN;
-
-	// ********** contextProperty **********
-
-	/**
-	 * Corresponds to the 'contextProperty' element of the TenantDiscriminatorColumn annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getContextProperty();
-		String CONTEXT_PROPERTY_PROPERTY = "contextProperty"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'contextProperty' element of the TenantDiscriminatorColumn annotation.
-	 * Set to null to remove the element.
-	 */
-	void setContextProperty(String table);
-
-	/**
-	 * Return the {@link TextRange} for the 'contextProperty' element. If the element
-	 * does not exist return the {@link TextRange} for the TenantDiscriminatorColumn annotation.
-	 */
-	TextRange getContextPropertyTextRange(CompilationUnit astRoot);
-	
-	// ********** table **********
-
-	/**
-	 * Corresponds to the 'table' element of the TenantDiscriminatorColumn annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	String getTable();
-		String TABLE_PROPERTY = "table"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'table' element of the TenantDiscriminatorColumn annotation.
-	 * Set to null to remove the element.
-	 */
-	void setTable(String table);
-
-	/**
-	 * Return the {@link TextRange} for the 'table' element. If the element
-	 * does not exist return the {@link TextRange} for the TenantDiscriminatorColumn annotation.
-	 */
-	TextRange getTableTextRange(CompilationUnit astRoot);
-
-	/**
-	 * Return whether the specified position touches the 'table' element.
-	 * Return false if the element does not exist.
-	 */
-	boolean tableTouches(int pos, CompilationUnit astRoot);
-
-	// ********** primaryKey **********
-
-	/**
-	 * Corresponds to the 'primaryKey' element of the TenantDiscriminatorColumn annotation.
-	 * Return null if the element does not exist in Java.
-	 */
-	Boolean getPrimaryKey();
-		String PRIMARY_KEY_PROPERTY = "primaryKey"; //$NON-NLS-1$
-
-	/**
-	 * Corresponds to the 'primaryKey' element of the TenantDiscriminatorColumn annotation.
-	 * Set to null to remove the element.
-	 */
-	void setPrimaryKey(Boolean primaryKey);
-
-	/**
-	 * Return the {@link TextRange} for the 'primaryKey' element. If the element
-	 * does not exist return the {@link TextRange} for the TenantDiscriminatorColumn annotation.
-	 */
-	TextRange getPrimaryKeyTextRange(CompilationUnit astRoot);
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/MultitenantType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/MultitenantType.java
deleted file mode 100644
index 7db896aa40..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_3/resource/java/MultitenantType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_3.resource.java;
-
-/**
- * Corresponds to the EclipseLink JPA enum
- * org.eclipse.persistence.annotations.MultitenantType
- * 
- * 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.
- * 
- * @version 3.1
- * @since 3.1
- */
-public enum MultitenantType {
-
-	SINGLE_TABLE(EclipseLink2_3.MULTITENANT_TYPE__SINGLE_TABLE),
-	TABLE_PER_TENANT(EclipseLink2_3.MULTITENANT_TYPE__TABLE_PER_TENANT);
-
-
-	private String javaAnnotationValue;
-
-	MultitenantType(String javaAnnotationValue) {
-		if (javaAnnotationValue == null) {
-			throw new NullPointerException();
-		}
-		this.javaAnnotationValue = javaAnnotationValue;
-	}
-
-	public String getJavaAnnotationValue() {
-		return this.javaAnnotationValue;
-	}
-
-
-	// ********** static methods **********
-
-	public static MultitenantType fromJavaAnnotationValue(Object javaAnnotationValue) {
-		return (javaAnnotationValue == null) ? null : fromJavaAnnotationValue_(javaAnnotationValue);
-	}
-
-	private static MultitenantType fromJavaAnnotationValue_(Object javaAnnotationValue) {
-		for (MultitenantType fetchType : MultitenantType.values()) {
-			if (fetchType.getJavaAnnotationValue().equals(javaAnnotationValue)) {
-				return fetchType;
-			}
-		}
-		return null;
-	}
-
-	public static String toJavaAnnotationValue(MultitenantType fetchType) {
-		return (fetchType == null) ? null : fetchType.getJavaAnnotationValue();
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_4/resource/java/EclipseLink2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_4/resource/java/EclipseLink2_4.java
deleted file mode 100644
index cd6bc80b2b..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/v2_4/resource/java/EclipseLink2_4.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.core.v2_4.resource.java;
-
-/**
- * EclipseLink Java-related stuff (annotations etc.)
- * 
- * 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.
- * 
- * @version 3.1
- * @since 3.1
- */
-@SuppressWarnings("nls")
-public interface EclipseLink2_4 {
-
-	// EclipseLink package
-	String PACKAGE = "org.eclipse.persistence.annotations"; //$NON-NLS-1$
-	String PACKAGE_ = PACKAGE + ".";
-
-
-	// ********** API **********
-
-	// EclispeLink 2.4 annotations
-	String MULTITENANT__INCLUDE_CRITERIA = "includeCriteria";
-
-}